Skip to content

Commit 8d1ac16

Browse files
MpdreamzMpdreamz
committed
Refactor domain model out of Elastic.Markdown.csproj
1 parent 6ba8b7b commit 8d1ac16

File tree

80 files changed

+309
-237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+309
-237
lines changed

‎Directory.Packages.props‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
</ItemGroup>
99
<!-- AWS -->
1010
<ItemGroup>
11-
<PackageVersion Include="Amazon.Lambda.RuntimeSupport" Version="1.13.0"/>
12-
<PackageVersion Include="Amazon.Lambda.Core" Version="2.5.1"/>
13-
<PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
14-
<PackageVersion Include="AWSSDK.S3" Version="3.7.416.9"/>
11+
<PackageVersion Include="Amazon.Lambda.RuntimeSupport" Version="1.13.0" />
12+
<PackageVersion Include="Amazon.Lambda.Core" Version="2.5.1" />
13+
<PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
14+
<PackageVersion Include="AWSSDK.S3" Version="3.7.416.9" />
15+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
1516
</ItemGroup>
16-
1717
<!-- Build -->
1818
<ItemGroup>
1919
<PackageVersion Include="Argu" Version="6.2.5" />
@@ -23,42 +23,40 @@
2323
<PackageVersion Include="Fake.IO.Zip" Version="6.1.3" />
2424
<PackageVersion Include="FSharp.Core" Version="9.0.202" />
2525
</ItemGroup>
26-
2726
<ItemGroup>
28-
<PackageVersion Include="ConsoleAppFramework" Version="5.4.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
27+
<PackageVersion Include="ConsoleAppFramework" Version="5.4.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
2928
<PackageVersion Include="ConsoleAppFramework.Abstractions" Version="5.4.1" />
30-
<PackageVersion Include="Crayon" Version="2.0.69"/>
29+
<PackageVersion Include="Crayon" Version="2.0.69" />
3130
<PackageVersion Include="DotNet.Glob" Version="3.1.3" />
3231
<PackageVersion Include="Errata" Version="0.13.0" />
33-
<PackageVersion Include="Github.Actions.Core" Version="9.0.0"/>
32+
<PackageVersion Include="Github.Actions.Core" Version="9.0.0" />
3433
<PackageVersion Include="Markdig" Version="0.40.0" />
35-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4"/>
36-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.4"/>
34+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
35+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
3736
<PackageVersion Include="NetEscapades.EnumGenerators" Version="1.0.0-beta12" PrivateAssets="all" ExcludeAssets="runtime" />
3837
<PackageVersion Include="Proc" Version="0.9.1" />
3938
<PackageVersion Include="RazorSlices" Version="0.8.1" />
4039
<PackageVersion Include="Samboy063.Tomlet" Version="6.0.0" />
4140
<PackageVersion Include="Slugify.Core" Version="4.0.1" />
4241
<PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
4342
<PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
44-
<PackageVersion Include="Utf8StreamReader" Version="1.3.2"/>
45-
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All"/>
43+
<PackageVersion Include="Utf8StreamReader" Version="1.3.2" />
44+
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All" />
4645
<PackageVersion Include="Westwind.AspNetCore.LiveReload" Version="0.5.2" />
4746
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
4847
</ItemGroup>
49-
5048
<!-- Test packages -->
5149
<ItemGroup>
52-
<PackageVersion Include="AngleSharp.Diffing" Version="1.0.0"/>
53-
<PackageVersion Include="DiffPlex" Version="1.7.2"/>
54-
<PackageVersion Include="FluentAssertions" Version="6.12.1"/>
55-
<PackageVersion Include="FsUnit.xUnit" Version="7.0.1"/>
50+
<PackageVersion Include="AngleSharp.Diffing" Version="1.0.0" />
51+
<PackageVersion Include="DiffPlex" Version="1.7.2" />
52+
<PackageVersion Include="FluentAssertions" Version="6.12.1" />
53+
<PackageVersion Include="FsUnit.xUnit" Version="7.0.1" />
5654
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
5755
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
58-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
59-
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29"/>
60-
<PackageVersion Include="Unquote" Version="7.0.1"/>
61-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2"/>
62-
<PackageVersion Include="xunit.v3" Version="1.1.0"/>
56+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
57+
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
58+
<PackageVersion Include="Unquote" Version="7.0.1" />
59+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
60+
<PackageVersion Include="xunit.v3" Version="1.1.0" />
6361
</ItemGroup>
64-
</Project>
62+
</Project>

‎Elastic.Documentation/Configuration/Assembler/AssemblyConfiguration.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information
44

5-
using Elastic.Documentation.Model.Serialization;
5+
using Elastic.Documentation.Serialization;
66
using YamlDotNet.Serialization;
77

8-
namespace Elastic.Documentation.Model.Configuration.Assembler;
8+
namespace Elastic.Documentation.Configuration.Assembler;
99

1010
public record AssemblyConfiguration
1111
{

‎Elastic.Documentation/Configuration/Assembler/ContentSource.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Text.Json.Serialization;
77
using NetEscapades.EnumGenerators;
88

9-
namespace Elastic.Documentation.Model.Configuration.Assembler;
9+
namespace Elastic.Documentation.Configuration.Assembler;
1010

1111
[EnumExtensions]
1212
public enum ContentSource

‎Elastic.Documentation/Configuration/Assembler/GoogleTagManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using YamlDotNet.Serialization;
66

7-
namespace Elastic.Documentation.Model.Configuration.Assembler;
7+
namespace Elastic.Documentation.Configuration.Assembler;
88

99
public record GoogleTagManager
1010
{

‎Elastic.Documentation/Configuration/Assembler/GoogleTagManagerConfiguration.cs‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// Licensed to Elasticsearch B.V under one or more agreements.
2+
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
3+
// See the LICENSE file in the project root for more information
4+
5+
using System.Diagnostics.CodeAnalysis;
6+
using System.Web;
7+
8+
namespace Elastic.Documentation.Configuration.Assembler;
9+
10+
public record GoogleTagManagerConfiguration
11+
{
12+
public bool Enabled { get; init; }
13+
[MemberNotNullWhen(returnValue: true, nameof(Enabled))]
14+
public string? Id { get; init; }
15+
public string? Auth { get; init; }
16+
public string? Preview { get; init; }
17+
public string? CookiesWin { get; init; }
18+
19+
public string QueryString()
20+
{
21+
var queryString = HttpUtility.ParseQueryString(string.Empty);
22+
if (Auth is not null)
23+
queryString.Add("gtm_auth", Auth);
24+
25+
if (Preview is not null)
26+
queryString.Add("gtm_preview", Preview);
27+
28+
if (CookiesWin is not null)
29+
queryString.Add("gtm_cookies_win", CookiesWin);
30+
31+
return queryString.Count > 0 ? $"&{queryString}" : string.Empty;
32+
}
33+
}

‎Elastic.Documentation/Configuration/Assembler/PublishEnvironment.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using YamlDotNet.Serialization;
66

7-
namespace Elastic.Documentation.Model.Configuration.Assembler;
7+
namespace Elastic.Documentation.Configuration.Assembler;
88

99
public record PublishEnvironment
1010
{

‎Elastic.Documentation/Configuration/Assembler/Repository.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using YamlDotNet.Serialization;
66

7-
namespace Elastic.Documentation.Model.Configuration.Assembler;
7+
namespace Elastic.Documentation.Configuration.Assembler;
88

99
public record NarrativeRepository : Repository
1010
{

‎src/Elastic.Markdown/IO/Configuration/EnabledExtensions.cs‎ renamed to ‎Elastic.Documentation/Configuration/Builder/EnabledExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information
44

5-
namespace Elastic.Markdown.IO.Configuration;
5+
namespace Elastic.Documentation.Configuration.Builder;
66

77
public class EnabledExtensions(IReadOnlyCollection<string> extensions)
88
{

‎src/Elastic.Markdown/IO/Configuration/FeatureFlags.cs‎ renamed to ‎Elastic.Documentation/Configuration/Builder/FeatureFlags.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information
44

5-
namespace Elastic.Markdown.IO.Configuration;
5+
namespace Elastic.Documentation.Configuration.Builder;
66

77
public class FeatureFlags(Dictionary<string, bool> featureFlags)
88
{

‎src/Elastic.Markdown/IO/Configuration/ITocItem.cs‎ renamed to ‎Elastic.Documentation/Configuration/TableOfContents/ITocItem.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information
44

5-
namespace Elastic.Markdown.IO.Configuration;
5+
using Elastic.Documentation.Navigation;
6+
7+
namespace Elastic.Documentation.Configuration.TableOfContents;
68

79
public interface ITocItem
810
{

0 commit comments

Comments
 (0)