Skip to content

Template Engine CLI commands: separate definitions from implementations #51747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmat merged 4 commits into from
Nov 21, 2025
Merged

Template Engine CLI commands: separate definitions from implementations #51747

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95d879f
Template Engine CLI commands: separate definitions from implementations
tmat Nov 13, 2025
0ab0790
Move
tmat Nov 14, 2025
0e4129b
Fixes
tmat Nov 15, 2025
3ad3e29
Fix
tmat Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes
  • Loading branch information
@tmat
tmat committed Nov 15, 2025
commit 0e4129bee6bc95442b2c47744ae92fbac9e4fb86
27 changes: 19 additions & 8 deletions src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/CommandDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ private static CommandDefinition Create()
return command;
}

internal static IReadOnlyDictionary<FilterOptionDefinition, Option> CreateFilterOptions(IEnumerable<FilterOptionDefinition> supportedFilters, bool isLegacy)
internal static OrderedDictionary<FilterOptionDefinition, Option> CreateFilterOptions(IEnumerable<FilterOptionDefinition> supportedFilters, bool isLegacy)
{
var filterOptionsMap = new Dictionary<FilterOptionDefinition, Option>();
var filterOptionsMap = new OrderedDictionary<FilterOptionDefinition, Option>();

foreach (var filterDef in supportedFilters)
{
Expand Down Expand Up @@ -232,8 +232,17 @@ public static class Show

public static class Instantiate
{
public static readonly Argument<string> ShortNameArgument = New.ShortNameArgument;
public static readonly Argument<string[]> RemainingArguments = New.RemainingArguments;
public static readonly Argument<string> ShortNameArgument = new("template-short-name")
{
Description = SymbolStrings.Command_Instantiate_Argument_ShortName,
Arity = new ArgumentArity(0, 1)
};

public static readonly Argument<string[]> RemainingArguments = new("template-args")
{
Description = SymbolStrings.Command_Instantiate_Argument_TemplateOptions,
Arity = new ArgumentArity(0, 999)
};

public static readonly CommandDefinition Command = new CommandDefinition("create", SymbolStrings.Command_Instantiate_Description)
{
Expand Down Expand Up @@ -390,7 +399,7 @@ public sealed class List : CommandDefinition
public Option<bool> ColumnsAllOption { get; }
public Option<string[]> ColumnsOption { get; }

public IReadOnlyDictionary<FilterOptionDefinition, Option> Filters { get; }
public OrderedDictionary<FilterOptionDefinition, Option> Filters { get; }

public List(string name, bool isLegacy)
: base(name, SymbolStrings.Command_List_Description)
Expand All @@ -402,6 +411,8 @@ public List(string name, bool isLegacy)

Arguments.Add(NameArgument);

Options.AddRange(Filters.Values);

Options.AddRange(
[
IgnoreConstraintsOption,
Expand All @@ -411,7 +422,6 @@ public List(string name, bool isLegacy)
ColumnsOption,
]);

Options.AddRange(Filters.Values);
this.AddNoLegacyUsageValidators(isLegacy ? [.. Filters.Values, ColumnsAllOption, ColumnsOption, New.ShortNameArgument] : []);
}
}
Expand Down Expand Up @@ -446,7 +456,7 @@ public sealed class Search : CommandDefinition
public Option<bool> ColumnsAllOption { get; }
public Option<string[]> ColumnsOption { get; }

public IReadOnlyDictionary<FilterOptionDefinition, Option> Filters { get; }
public OrderedDictionary<FilterOptionDefinition, Option> Filters { get; }

public Search(string name, bool isLegacy)
: base(name, SymbolStrings.Command_Search_Description)
Expand All @@ -458,13 +468,14 @@ public Search(string name, bool isLegacy)

Arguments.Add(NameArgument);

Options.AddRange(Filters.Values);

Options.AddRange(
[
ColumnsAllOption,
ColumnsOption,
]);

Options.AddRange(Filters.Values);
this.AddNoLegacyUsageValidators(isLegacy ? [.. Filters.Values, ColumnsAllOption, ColumnsOption, New.ShortNameArgument] : []);
}
}
Expand Down
Loading