Merge pull request #82 from Jcparkyn/dev

Update to v1.1.0

Author: Jcparkyn

.gitignore

@@ -337,4 +337,7 @@ ASALocalRun/
 .localhistory/
 
 # BeatPulse healthcheck temp database
-healthchecksdb
+healthchecksdb
+
+# Auto-generated xml documentation file
+Nodexr/Nodexr.xml

Nodexr.Tests/RegexParserTests/RegexParserTests.cs

@@ -13,42 +13,13 @@ namespace Nodexr.Tests.RegexParserTests
 {
     class RegexParserTests
     {
-
-
-/*        [TestCase(@"a", @"a")]
-        public void TextNode_BasicString_ReturnsContents(string input, string expectedContents)
-        {
-            var result = TextParser.ParseTextWithOptionalQuantifier.ParseOrThrow(input);
-            Assert.AreEqual(expectedContents, result.Input.Contents);
-        }
-
-        [TestCase(@"a")]
-        [TestCase(@"abc")]
-        [TestCase(@"ab\tc")]
-        [TestCase(@"ab\\c")]
-        [TestCase(@"ab\\\c")]
-        [TestCase(@"\\\*c", Ignore = "Low priority, will fix later")]
-        public void TextNode_ValidStrings_OutputsSame(string input)
-        {
-            var result = RegexParser.ParseTextNode.ParseOrThrow(input);
-            Assert.AreEqual(input, result.CachedOutput);
-        }
-
-        [TestCase(@"\")]
-        [TestCase(@"\\\")]
-        [TestCase(@"*")]
-        public void TextNode_InvalidStrings_Fails(string input)
-        {
-            TestDelegate getResult = () => RegexParser.ParseTextNode.ParseOrThrow(input);
-            Assert.Throws<ParseException>(getResult);
-        }*/
-
         [TestCase(@"abc")]
         [TestCase(@"abc[abc]")]
         [TestCase(@"[abc]+")]
         [TestCase(@"(a[bc])+")]
         [TestCase(@"^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$")] //Email address
         [TestCase(@"^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$")] //Floating point
+        [TestCase(@"^((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])(\.(?!$)|$)){4}$")] //IPv4. Contains empty group option.
         public void ParseRegex_OutputIsSameAsInput(string input)
         {
             var outputNode = RegexParser.ParseRegex.ParseOrThrow(input);

Nodexr/Nodexr.csproj

@@ -28,6 +28,10 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
     <PackageReference Include="Pidgin" Version="2.4.0" />
+    <PackageReference Include="Roslynator.Analyzers" Version="2.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="System.Net.Http.Json" Version="3.2.0" />
 
   </ItemGroup>

Nodexr/Nodexr.xml

@@ -17,22 +17,22 @@
 
 namespace Nodexr
 {
-    public class Program
+    public static class Program
     {
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
             builder.RootComponents.Add<App>("app");
 
             builder.Services.AddBlazoredToast();
-            builder.Services.AddTransient(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+            builder.Services.AddTransient(_ => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddScoped<INodeDragService, NodeDragService>();
             builder.Services.AddScoped<INoodleDragService, NoodleDragService>();
             builder.Services.AddScoped<INodeHandler, NodeHandler>();
             builder.Services.AddScoped<RegexReplaceHandler>();
             builder.Services.AddBlazoredModal();
 
-            await builder.Build().RunAsync();
+            await builder.Build().RunAsync().ConfigureAwait(false);
         }
     }
 }

Nodexr/Program.cs

@@ -7,7 +7,7 @@
 
 @foreach (var node in Nodes)
 {
-    var inputsWithNoodles = node.GetInputsRecursive()
+    var inputsWithNoodles = node.GetAllInputs()
         .OfType<InputProcedural>()
         .Where(input => input.ConnectedNode != null);
 

Nodexr/Shared/Components/NoodleCollection.razor

@@ -3,13 +3,14 @@
 @inject IModalService ModalService
 @inject NavigationManager NavManager
 @inject IToastService ToastService
+@inject RegexReplaceHandler RegexReplaceHandler
 @using Microsoft.AspNetCore.WebUtilities
 
 <h3 style="margin:6px 10px 7px 7px; display:inline-block;">Output:</h3>
 
 <div class="output-regex-container">
     <div class="output-regex">@foreach (var segment in @NodeHandler.CachedOutput)
-        {<OutputDisplaySegment Segment="segment" />}</div>
+        {<OutputDisplaySegment Segment="segment" />@*This must not be surrounded by whitespace*@}</div>
 
     <button title="Copy to clipboard" class="output-regex output-regex-button" @onclick="CopyTextToClipboard"><i class="far fa-clipboard"></i></button>
     <button title="Edit" class="output-regex output-regex-button" @onclick="OnEditButtonClick"><i class="fas fa-pencil-alt"></i></button>
@@ -44,7 +45,22 @@
 
     private async Task OnCreateLinkButtonClick()
     {
-        string url = QueryHelpers.AddQueryString(NavManager.BaseUri, "parse", NodeHandler.CachedOutput.Expression);
+        var urlParams = new Dictionary<string, string>
+        {
+            { "parse", NodeHandler.CachedOutput.Expression }
+        };
+
+        if (RegexReplaceHandler.SearchText != RegexReplaceHandler.DefaultSearchText)
+        {
+            urlParams.Add("search", RegexReplaceHandler.SearchText);
+        }
+
+        if (RegexReplaceHandler.ReplacementRegex != RegexReplaceHandler.DefaultReplacementRegex)
+        {
+            urlParams.Add("replace", RegexReplaceHandler.ReplacementRegex);
+        }
+
+        string url = QueryHelpers.AddQueryString(NavManager.BaseUri, urlParams);
         await JSRuntime.InvokeVoidAsync("clipboardCopy.copyText", url, "");
         ToastService.ShowInfo("", "Link copied to clipboard");
     }

Nodexr/Shared/Components/OutputDisplay.razor

@@ -14,7 +14,7 @@ public bool IsChecked
             }
         }
 
-        public override int Height => 19;
+        public override int Height => 23;
 
         public InputCheckbox(bool isChecked = false)
         {

Nodexr/Shared/NodeInputs/InputCheckbox.cs

@@ -1,4 +1,5 @@
-using System;
+using Nodexr.Shared.Nodes;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -28,9 +29,10 @@ private void OnInputPositionsChanged()
             InputPositionsChanged?.Invoke(this, EventArgs.Empty);
         }
 
-        public void AddItem()
+        public void AddItem(INodeOutput node = null)
         {
             var newInput = new InputProcedural() { Title = this.Title };
+            newInput.ConnectedNode = node;
             newInput.ValueChanged += OnValueChanged;
             inputs.Add(newInput);
             OnInputPositionsChanged();

Nodexr/Shared/NodeInputs/InputCollection.cs

@@ -7,6 +7,7 @@ namespace Nodexr.Shared.NodeInputs
     public class InputProcedural : NodeInput, INoodleData
     {
         private INodeOutput connectedNode;
+
         public INodeOutput ConnectedNode
         {
             get => connectedNode;

Nodexr/Shared/NodeInputs/InputProcedural.cs

@@ -9,6 +9,7 @@ namespace Nodexr.Shared.NodeTypes
     public class AnchorNode : Node
     {
         public override string Title => "Anchor";
+
         public override string NodeInfo => "Inserts a start-of-line or end-of-line character. " +
             "Useful for ensuring that your regex only matches if it's at a specific position in a line." +
             "\nNote: The \"Start/End of string\" options will match the starts and ends of individual lines when in Multiline mode.";

Nodexr/Shared/NodeTypes/AnchorNode.cs

@@ -9,6 +9,7 @@ namespace Nodexr.Shared.NodeTypes
     public class CharSetNode : Node, IQuantifiableNode
     {
         public override string Title => "Character Set";
+
         public override string NodeInfo => "Inserts a character class containing the characters you specify. "
             + "You can enter these the same way you would in a normal regex, including ranges (e.g. A-Z).\n"
             + "The 'Invert' option creates a negated class by adding a ^ character at the start.";
@@ -33,7 +34,7 @@ public CharSetNode()
             SetupInputEnables();
         }
 
-        void SetupInputEnables()
+        private void SetupInputEnables()
         {
             InputNumber.IsEnabled = () => InputCount.Value == Reps.Number;
             InputMin.IsEnabled = () => InputCount.Value == Reps.Range;
@@ -42,7 +43,6 @@ void SetupInputEnables()
 
         protected override NodeResultBuilder GetValue()
         {
-
             string charSet = InputCharacters.GetValue();
 
             string prefix = InputDoInvert.IsChecked ? "^" : "";

Nodexr/Shared/NodeTypes/CharSetNode.cs

@@ -11,7 +11,6 @@ public class IfElseNode : Node
         public override string NodeInfo => "Matches either of two expressions, depending on whether the 'Condition' expression has matched. " +
             "\nIf the name or number of a captured group is used as the 'Condition' expression, it will be considered to have matched if the group it references was matched.";
 
-
         [NodeInput]
         public InputString InputCondition { get; } = new InputString("") { Title = "Condition:" };
 
@@ -21,7 +20,6 @@ public class IfElseNode : Node
         [NodeInput]
         public InputProcedural InputElse { get; set; } = new InputProcedural() { Title = "Match if false" };
 
-
         protected override NodeResultBuilder GetValue()
         {
             //return null;

Nodexr/Shared/NodeTypes/IfElseNode.cs

@@ -9,28 +9,56 @@ namespace Nodexr.Shared.NodeTypes
     public class OrNode : Node, INode
     {
         public override string Title => "Or";
+
         public override string NodeInfo => "Outputs a Regex that will accept any of the given inputs.";
 
         [NodeInput]
-        public InputCollection Inputs { get; } = new InputCollection("Option", 2);
+        public InputCheckbox InputCapture { get; } = new InputCheckbox(false) { Title = "Capture" };
+
+        [NodeInput]
+        public InputCollection Inputs { get; } = new InputCollection("Option");
+
+        public OrNode()
+        {
+            Inputs.AddItem();
+            Inputs.AddItem();
+        }
+
+        /// <summary>
+        /// Creates an OrNode with the given nodes as inputs.
+        /// </summary>
+        public OrNode(IEnumerable<INodeOutput> inputs)
+        {
+            foreach (var input in inputs)
+            {
+                Inputs.AddItem(input);
+            }
+        }
+
+        /// <summary>
+        /// Creates an OrNode with the given nodes as inputs.
+        /// This overload is to allow easy instantiation with params.
+        /// </summary>
+        public OrNode(params INodeOutput[] inputs) : this(inputs as IEnumerable<INodeOutput>) { }
 
         protected override NodeResultBuilder GetValue()
         {
             var builder = new NodeResultBuilder();
-            var inputs = Inputs.Inputs.Where(input => input.IsConnected);
-            builder.Append(@"(?:", this);
+            var inputs = Inputs.Inputs;
+            string prefix = InputCapture.IsChecked ? "(" : "(?:";
+            builder.Append(prefix, this);
 
-            if (inputs.Any())
+            if (inputs.Count > 0)
             {
                 builder.Append(inputs.First().Value);
                 foreach (var input in inputs.Skip(1))
                 {
                     builder.Append("|", this);
                     builder.Append(input.Value);
-                } 
+                }
             }
-            builder.Append(")", this);
 
+            builder.Append(")", this);
             return builder;
         }
     }