astro-accelerator-utils 0.1.17 → 0.1.18

package/index.d.mts

@@ -3,6 +3,7 @@ import { Cache } from "./lib/v1/cache.mjs";
 import { DateFormatter } from "./lib/v1/dates.mjs";
 import { Markdown } from "./lib/v1/markdown.mjs";
 import { Navigation } from "./lib/v1/navigation.mjs";
+import { Paging } from "./lib/v1/paging.mjs";
 import { Posts } from "./lib/v1/posts.mjs";
 import { UrlFormatter } from "./lib/v1/urls.mjs";
 import * as PostFiltering from "./lib/postFiltering.mjs";
@@ -10,4 +11,4 @@ import * as PostOrdering from "./lib/postOrdering.mjs";
 import * as PostPaging from "./lib/postPaging.mjs";
 import * as FooterMenu from "./lib/footerMenu.mjs";
 import * as Taxonomy from "./lib/taxonomy.mjs";
-export { Authors, Cache, DateFormatter, Markdown, Navigation, Posts, UrlFormatter, PostFiltering, PostOrdering, PostPaging, FooterMenu, Taxonomy };
+export { Authors, Cache, DateFormatter, Markdown, Navigation, Paging, Posts, UrlFormatter, PostFiltering, PostOrdering, PostPaging, FooterMenu, Taxonomy };

package/index.mjs

@@ -3,6 +3,7 @@ import { Cache } from './lib/v1/cache.mjs';
 import { DateFormatter } from './lib/v1/dates.mjs';
 import { Markdown } from './lib/v1/markdown.mjs';
 import { Navigation } from './lib/v1/navigation.mjs';
+import { Paging } from './lib/v1/paging.mjs';
 import { Posts } from './lib/v1/posts.mjs';
 import { UrlFormatter } from './lib/v1/urls.mjs';
 
@@ -18,6 +19,7 @@ export {
     DateFormatter,
     Markdown,
     Navigation,
+    Paging,
     Posts,
     UrlFormatter,
     PostFiltering,

package/lib/v1/paging.d.mts

@@ -0,0 +1,15 @@
+/**
+ * @typedef { import("../types/Link").Link } Link
+ */
+export class Paging {
+    /**
+     * Provides a list of paging links, 1 ... 3 4 5 ... 7
+     * @param {number} limit
+     * @param {number} numberOfPages
+     * @param {number} currentPage
+     * @param {string} url
+     * @returns {Link[]}
+     */
+    links(limit: number, numberOfPages: number, currentPage: number, url: string): Link[];
+}
+export type Link = any;

package/lib/v1/paging.mjs

@@ -0,0 +1,78 @@
+/**
+ * @typedef { import("../types/Link").Link } Link
+ */
+
+export class Paging {
+  /**
+   * Provides a list of paging links, 1 ... 3 4 5 ... 7
+   * @param {number} limit 
+   * @param {number} numberOfPages 
+   * @param {number} currentPage 
+   * @param {string} url 
+   * @returns {Link[]}
+   */
+  links (limit, numberOfPages, currentPage, url) {
+      /** @type {Link[]} */
+      const pageLinks = [];
+    
+      let start = 0;
+      let end = numberOfPages;
+    
+      if (numberOfPages > limit) {
+        start = (currentPage - (limit - 1) / 2) - 1;
+        if (start < 0) {
+          start = 0;
+        }
+    
+        end = (start + limit);
+        if (end > numberOfPages) {
+          end = numberOfPages;
+          start = numberOfPages - limit;
+        }
+      }
+    
+      if (start == 1) {
+        pageLinks.push({
+          title: '1',
+          url: url.replace('/' + currentPage, '/' + 1),
+          ariaCurrent: false,
+          class: ''
+        });
+      } else if (start > 1) {
+        pageLinks.push({
+          title: '1',
+          url: url.replace('/' + currentPage, '/' + 1),
+          ariaCurrent: false,
+          class: 'paging-collapse-after'
+        });
+      }
+    
+      for (let i = start; i < end; i++) {
+        const userPage = i + 1;
+        pageLinks.push({
+          title: userPage.toString(),
+          url: url.replace('/' + currentPage, '/' + userPage),
+          ariaCurrent: userPage == currentPage ? 'page' : false,
+          class: ''
+        });
+      }
+    
+      if (end < (numberOfPages - 1)) {
+        pageLinks.push({
+          title: numberOfPages.toString(),
+          url: url.replace('/' + currentPage, '/' + numberOfPages),
+          ariaCurrent: false,
+          class: 'paging-collapse-before'
+        });
+      } else if (end < numberOfPages) {
+        pageLinks.push({
+          title: numberOfPages.toString(),
+          url: url.replace('/' + currentPage, '/' + numberOfPages),
+          ariaCurrent: false,
+          class: ''
+        });
+      }
+    
+      return pageLinks;
+  }
+}

package/lib/v1/posts.mjs

@@ -10,8 +10,8 @@ export class Posts {
      * @param {() => MarkdownInstance[]} [fetchAll]
      */
     constructor(cache, fetchAll) {
-        /* istanbul ignore next */
         this.cache = cache;
+        /* istanbul ignore next */
         this.fetchAll = fetchAll ?? function() { 
             return import.meta.glob("/src/pages/**/*.md", { eager: true });
         }
@@ -35,12 +35,12 @@ export class Posts {
      * @returns {MarkdownInstance[]}
      */
     root (subfolder) {
-        console.log('SUBFOLDER IS', subfolder)
         const isRoot = subfolder.length == 0;
         const expectedDepth = isRoot ? 1 : 2;
 
         return this.all().filter(p => {
-            const depth = (p.url ?? '/').split('/').length - 1;
+            const url = p.url ?? '/';
+            const depth = (url).split('/').length - 1;
             return depth == expectedDepth
                 || (depth == (expectedDepth - 1) && p.file.includes(subfolder.toLowerCase() + '.md'));
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-accelerator-utils",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "Astro utilities for Astro Accelerator.",
   "main": "index.mjs",
   "type": "module",