From 33fd5fabfd63a70a2bc931ed295c0d1e15159360 Mon Sep 17 00:00:00 2001
From: "Maksim.Panasenko" <maks.panasenko01@bk.ru>
Date: Sun, 5 Jun 2022 00:06:11 +0300
Subject: [PATCH] added array length support

---
 Src/Newtonsoft.Json.Tests/Issues/Issue2688.cs | 115 ++++++++++++++++++
 Src/Newtonsoft.Json/Linq/JArray.cs            |   1 +
 .../Linq/JsonPath/FieldFilter.cs              |   4 +
 3 files changed, 120 insertions(+)
 create mode 100644 Src/Newtonsoft.Json.Tests/Issues/Issue2688.cs

diff --git a/Src/Newtonsoft.Json.Tests/Issues/Issue2688.cs b/Src/Newtonsoft.Json.Tests/Issues/Issue2688.cs
new file mode 100644
index 000000000..638e4c150
--- /dev/null
+++ b/Src/Newtonsoft.Json.Tests/Issues/Issue2688.cs
@@ -0,0 +1,115 @@
+#region License
+// Copyright (c) 2022 James Newton-King
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+#endregion
+
+using Newtonsoft.Json.Linq;
+
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
+using NUnit.Framework;
+#endif
+
+namespace Newtonsoft.Json.Tests.Issues
+{
+    [TestFixture]
+    public class Issue2688
+    {
+        [Test]
+        public void ArrayLength()
+        {
+			string json = @"{
+	""firstName"": ""John"",
+	""lastName"": ""doe"",
+	""age"": 26,
+	""address"": {
+        ""streetAddress"": ""naist street"",
+		""city"": ""Nara"",
+		""postalCode"": ""630-0192""
+		},
+	""phoneNumbers"": [
+		{
+        ""type"": ""iPhone"",
+		""number"": ""0123-4567-8888""
+		},
+		{
+        ""type"": ""home"",
+		""number"": ""0123-4567-8910""
+		}
+		]
+	}";
+			JObject jobj = JObject.Parse(json);
+            string jsonPath = "$.phoneNumbers.length";
+            JToken token = jobj.SelectToken(jsonPath);
+            string count = token.ToString();
+            string expected = "2";
+            Assert.AreEqual(expected, count);
+        }
+
+		[Test]
+		public void ArrayLengthInBooleanExpression()
+		{
+			string json = @"{
+	""store"" : {
+		""book"" : [{
+				""category"" : ""reference"",
+				""author"" : ""Nigel Rees"",
+				""title"" : ""Sayings of the Century"",
+				""price"" : 8.68
+			}, {
+				""category"" : ""fiction"",
+				""author"" : ""Evelyn Waugh"",
+				""title"" : ""Sword of Honour"",
+				""price"" : 12.99
+			}, {
+				""category"" : ""fiction"",
+				""author"" : ""Herman Melville"",
+				""title"" : ""Moby Dick"",
+				""isbn"" : ""0-553-21311-3"",
+				""price"" : 2.56
+			}, {
+				""category"" : ""fiction"",
+				""author"" : ""J. R. R. Tolkien"",
+				""title"" : ""The Lord of the Rings"",
+				""isbn"" : ""0-395-19395-8"",
+				""price"" : 22.99
+			}
+		],
+		""bicycle"" : {
+				""color"" : ""red"",
+			""price"" : 19.95
+		}
+		}
+	}";
+			string jsonPath = "$.store.book[?(@.price < $.store.book.length)].author";
+			JObject jobj = JObject.Parse(json);
+			JToken token = jobj.SelectToken(jsonPath);
+			string actual = token.ToString();
+			string expected = "Herman Melville";
+			Assert.AreEqual(expected, actual);
+		}
+    }
+}
diff --git a/Src/Newtonsoft.Json/Linq/JArray.cs b/Src/Newtonsoft.Json/Linq/JArray.cs
index 241a56045..b74c90c3d 100644
--- a/Src/Newtonsoft.Json/Linq/JArray.cs
+++ b/Src/Newtonsoft.Json/Linq/JArray.cs
@@ -41,6 +41,7 @@ namespace Newtonsoft.Json.Linq
     public partial class JArray : JContainer, IList<JToken>
     {
         private readonly List<JToken> _values = new List<JToken>();
+        static internal readonly string LengthProperty = "length";
 
         /// <summary>
         /// Gets the container's children tokens.
diff --git a/Src/Newtonsoft.Json/Linq/JsonPath/FieldFilter.cs b/Src/Newtonsoft.Json/Linq/JsonPath/FieldFilter.cs
index 97f638166..3c4517683 100644
--- a/Src/Newtonsoft.Json/Linq/JsonPath/FieldFilter.cs
+++ b/Src/Newtonsoft.Json/Linq/JsonPath/FieldFilter.cs
@@ -40,6 +40,10 @@ public override IEnumerable<JToken> ExecuteFilter(JToken root, IEnumerable<JToke
                         }
                     }
                 }
+                else if (Name == JArray.LengthProperty && t is JArray arr)
+                {
+                    yield return arr.Count;
+                }
                 else
                 {
                     if (settings?.ErrorWhenNoMatch ?? false)