Version 12

examples/Example.DAL/Animal.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Example.DAL;
+namespace Example.DAL;
 
 public partial class Animal
 {

examples/Example.DAL/DatabaseContext.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 
 namespace Example.DAL;
 

examples/Example.DAL/User.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Example.DAL;
+namespace Example.DAL;
 
 public partial class User
 {

src/Directory.Build.props

@@ -10,10 +10,10 @@
         <Copyright>Andrew Gubskiy © 2024</Copyright>
         <Company>Ukrainian .NET Developer Community</Company>
 
-        <Version>10.5.0-pre</Version>
-        <AssemblyVersion>10.5.0</AssemblyVersion>
-        <FileVersion>10.5.0</FileVersion>
-        <PackageVersion>10.5.0-pre</PackageVersion>
+        <Version>12.0.1</Version>
+        <AssemblyVersion>12.0.1</AssemblyVersion>
+        <FileVersion>12.0.1</FileVersion>
+        <PackageVersion>12.0.1-pre</PackageVersion>
 
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/dncuug/X.PagedList.git</RepositoryUrl>

src/X.PagedList/BasePagedList.cs

@@ -19,65 +19,111 @@ namespace X.PagedList;
 [PublicAPI]
 public abstract class BasePagedList<T> : IPagedList<T>
 {
-    protected List<T> Subset = new();
-
     public const int DefaultPageSize = 100;
+
+    protected List<T> Subset = new();
 
     /// <summary>
     /// Total number of subsets within the superset.
     /// </summary>
-    public int PageCount { get; protected set; }
+    /// <value>
+    /// Total number of subsets within the superset.
+    /// </value>
+    public int PageCount => TotalItemCount > 0 ? (int)Math.Ceiling(TotalItemCount / (double)PageSize) : 0;
 
     /// <summary>
     /// Total number of objects contained within the superset.
     /// </summary>
+    /// <value>
+    /// Total number of objects contained within the superset.
+    /// </value>
     public int TotalItemCount { get; protected set; }
 
     /// <summary>
     /// One-based index of this subset within the superset, zero if the superset is empty.
     /// </summary>
+    /// <value>
+    /// One-based index of this subset within the superset, zero if the superset is empty.
+    /// </value>
     public int PageNumber { get; protected set; }
 
     /// <summary>
     /// Maximum size any individual subset.
     /// </summary>
+    /// <value>
+    /// Maximum size any individual subset.
+    /// </value>
     public int PageSize { get; protected set; }
 
     /// <summary>
-    /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
-    /// is NOT the first subset within the superset.
+    /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is NOT the first subset within the superset.
     /// </summary>
-    public bool HasPreviousPage { get; protected set; }
+    /// <value>
+    /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is NOT the first subset within the superset.
+    /// </value>
+    public bool HasPreviousPage => PageCount > 0 && PageNumber <= PageCount && PageNumber > 1;
 
     /// <summary>
     /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
     /// is NOT the last subset within the superset.
     /// </summary>
-    public bool HasNextPage { get; protected set; }
+    /// <value>
+    /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+    /// is NOT the last subset within the superset.
+    /// </value>
+    public bool HasNextPage => PageCount > 0 && PageNumber <= PageCount && PageNumber < PageCount;
 
     /// <summary>
     /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this  is
     /// the first subset within the superset.
     /// </summary>
-    public bool IsFirstPage { get; protected set; }
+    /// <value>
+    /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and
+    /// this is the first subset within the superset.
+    /// </value>
+    public bool IsFirstPage => PageCount > 0 && PageNumber <= PageCount && PageNumber == 1;
 
     /// <summary>
     /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is
     /// the last subset within the superset.
     /// </summary>
-    public bool IsLastPage { get; protected set; }
+    /// <value>
+    /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+    /// is the last subset within the superset.
+    /// </value>
+    public bool IsLastPage => PageCount > 0 && PageNumber <= PageCount && PageNumber == PageCount;
 
     /// <summary>
     /// One-based index of the first item in the paged subset, zero if the superset is empty or PageNumber
     /// is greater than PageCount.
     /// </summary>
-    public int FirstItemOnPage { get; protected set; }
+    /// <value>
+    /// One-based index of the first item in the paged subset, zero if the superset is empty or PageNumber
+    /// is greater than PageCount.
+    /// </value>
+    public int FirstItemOnPage => PageCount > 0 && PageNumber <= PageCount ? (PageNumber - 1) * PageSize + 1 : 0;
 
     /// <summary>
     /// One-based index of the last item in the paged subset, zero if the superset is empty or PageNumber is
     /// greater than PageCount.
     /// </summary>
-    public int LastItemOnPage { get; protected set; }
+    /// <value>
+    /// One-based index of the last item in the paged subset, zero if the superset is empty or PageNumber
+    /// is greater than PageCount.
+    /// </value>
+    public int LastItemOnPage
+    {
+        get
+        {
+            int numberOfLastItemOnPage = (PageNumber - 1) * PageSize + 1 + PageSize - 1;
+
+            var result = PageCount > 0 && PageNumber <= PageCount
+                ? numberOfLastItemOnPage > TotalItemCount ? TotalItemCount : numberOfLastItemOnPage
+                : 0;
+
+            return result;
+        }
+    }
 
     /// <summary>
     /// Parameterless constructor.
@@ -107,54 +153,26 @@ protected internal BasePagedList(int pageNumber, int pageSize, int totalItemCoun
 
         if (totalItemCount < 0)
         {
-            throw new ArgumentOutOfRangeException(
-                $"totalItemCount = {totalItemCount}. TotalItemCount cannot be less than 0.");
+            throw new ArgumentOutOfRangeException($"totalItemCount = {totalItemCount}. TotalItemCount cannot be less than 0.");
         }
 
         // set source to blank list if superset is null to prevent exceptions
         TotalItemCount = totalItemCount;
         PageSize = pageSize;
         PageNumber = pageNumber;
-
-        PageCount = TotalItemCount > 0
-            ? (int)Math.Ceiling(TotalItemCount / (double)PageSize)
-            : 0;
-
-        bool pageNumberIsGood = PageCount > 0 && PageNumber <= PageCount;
-
-        HasPreviousPage = pageNumberIsGood && PageNumber > 1;
-        HasNextPage = pageNumberIsGood && PageNumber < PageCount;
-        IsFirstPage = pageNumberIsGood && PageNumber == 1;
-        IsLastPage = pageNumberIsGood && PageNumber == PageCount;
-
-        int numberOfFirstItemOnPage = (PageNumber - 1) * PageSize + 1;
-
-        FirstItemOnPage = pageNumberIsGood ? numberOfFirstItemOnPage : 0;
-
-        int numberOfLastItemOnPage = numberOfFirstItemOnPage + PageSize - 1;
-
-        LastItemOnPage = pageNumberIsGood
-            ? numberOfLastItemOnPage > TotalItemCount ? TotalItemCount : numberOfLastItemOnPage
-            : 0;
     }
 
     /// <summary>
-    /// 	Returns an enumerator that iterates through the BasePagedList&lt;T&gt;.
+    /// Returns an enumerator that iterates through the BasePagedList&lt;T&gt;.
     /// </summary>
     /// <returns>A BasePagedList&lt;T&gt;.Enumerator for the BasePagedList&lt;T&gt;.</returns>
-    public IEnumerator<T> GetEnumerator()
-    {
-        return Subset.GetEnumerator();
-    }
+    public IEnumerator<T> GetEnumerator() => Subset.GetEnumerator();
 
     /// <summary>
-    /// 	Returns an enumerator that iterates through the BasePagedList&lt;T&gt;.
+    /// Returns an enumerator that iterates through the BasePagedList&lt;T&gt;.
     /// </summary>
     /// <returns>A BasePagedList&lt;T&gt;.Enumerator for the BasePagedList&lt;T&gt;.</returns>
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-        return GetEnumerator();
-    }
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
     ///<summary>
     ///	Gets the element at the specified index.
@@ -166,11 +184,4 @@ IEnumerator IEnumerable.GetEnumerator()
     /// 	Gets the number of elements contained on this page.
     /// </summary>
     public virtual int Count => Subset.Count;
-
-    ///<summary>
-    /// Gets a non-enumerable copy of this paged list.
-    ///</summary>
-    ///<returns>A non-enumerable copy of this paged list.</returns>
-    [Obsolete("This method will be removed in future versions")]
-    public PagedListMetaData GetMetaData() => new(this);
 }

src/X.PagedList/IPagedList.cs

@@ -1,5 +1,4 @@
-using System;
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using System.Collections.Generic;
 
 namespace X.PagedList;
@@ -11,15 +10,7 @@ namespace X.PagedList;
 /// <typeparam name="T">The type of object the collection should contain.</typeparam>
 /// <seealso cref="IReadOnlyList{T}"/>
 [PublicAPI]
-public interface IPagedList<out T> : IPagedList, IReadOnlyList<T>
-{
-    ///<summary>
-    /// Gets a non-enumerable copy of this paged list.
-    ///</summary>
-    ///<returns>A non-enumerable copy of this paged list.</returns>
-    [Obsolete("This method will be removed in future versions")]
-    PagedListMetaData GetMetaData();
-}
+public interface IPagedList<out T> : IPagedList, IReadOnlyList<T>;
 
 /// <summary>
 /// Represents a subset of a collection of objects that can be individually accessed by index and containing

src/X.PagedList/PagedList.cs

@@ -79,13 +79,6 @@ public PagedList(IPagedList pagedList, IEnumerable<T> collection)
         TotalItemCount = pagedList.TotalItemCount;
         PageSize = pagedList.PageSize;
         PageNumber = pagedList.PageNumber;
-        PageCount = pagedList.PageCount;
-        HasPreviousPage = pagedList.HasPreviousPage;
-        HasNextPage = pagedList.HasNextPage;
-        IsFirstPage = pagedList.IsFirstPage;
-        IsLastPage = pagedList.IsLastPage;
-        FirstItemOnPage = pagedList.FirstItemOnPage;
-        LastItemOnPage = pagedList.LastItemOnPage;
 
         Subset.AddRange(collection);