@uxf/router 11.11.3 → 11.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/router",
-  "version": "11.11.3",
+  "version": "11.22.0",
   "description": "UXF Router",
   "author": "UXFans <dev@uxf.cz>",
   "homepage": "https://gitlab.com/uxf-npm/router#readme",

package/router.d.ts

@@ -1,5 +1,5 @@
 import { LinkProps } from "next/link";
-import { SitemapGeneratorOptions, SitemapGeneratorType } from "./sitemapGenerator";
+import { SitemapGeneratorOptions, SitemapGeneratorType } from "./sitemap-generator";
 import { QueryParams } from "./types";
 export type FunctionParametersGenerator<RouteList> = {
     [K in keyof RouteList]: RouteList[K] extends null ? [K] : [K, RouteList[K]];

package/router.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRouter = void 0;
 const router_1 = require("next/router");
 const qs_1 = require("qs");
-const sitemapGenerator_1 = require("./sitemapGenerator");
+const sitemap_generator_1 = require("./sitemap-generator");
 function createRouter(routes) {
     return {
         route: (route, params = undefined) => ({
@@ -70,7 +70,7 @@ function createRouter(routes) {
             }
             return activeRoute;
         },
-        createSitemapGenerator: sitemapGenerator_1.createSitemapGenerator,
+        createSitemapGenerator: sitemap_generator_1.createSitemapGenerator,
         routes,
         useQueryParams: () => (0, router_1.useRouter)().query,
     };

package/{sitemapGenerator.js → sitemap-generator.js}

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSitemapGenerator = void 0;
+const object_to_xml_1 = require("./utils/object-to-xml");
 function filterNullish(val) {
     return val.filter((item) => item !== null && item !== undefined);
 }
@@ -12,19 +13,9 @@ class SitemapGenerator {
         this.toXml = () => {
             return this.getSitemapItems().then((sitemapItems) => {
                 return `<?xml version="1.0" encoding="UTF-8"?>
-        <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
-            ${sitemapItems
-                    .map((item) => {
-                    var _a, _b;
-                    return `<url>
-                        <loc>${(_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.baseUrl) !== null && _b !== void 0 ? _b : ""}${item.loc}</loc>
-                            ${item.priority ? `<priority>${item.priority}</priority>` : ""}
-                            ${item.lastmod ? `<lastmod>${item.lastmod}</lastmod>` : ""}
-                            ${item.changefreq ? `<changefreq>${item.changefreq}</changefreq>` : ""}
-                        </url>`;
-                })
-                    .join("")}
-        </urlset>`;
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+${sitemapItems.map((item) => `    <url>\n${(0, object_to_xml_1.objectToXml)(item)}\n    </url>`).join("\n")}
+</urlset>`;
             });
         };
         this.toJson = () => this.getSitemapItems().then(JSON.stringify);

package/sitemap-generator.test.d.ts

@@ -0,0 +1 @@
+export {};

package/sitemap-generator.test.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const router_1 = require("./router");
+const { createSitemapGenerator, routeToUrl } = (0, router_1.createRouter)({
+    index: "/",
+    catchAllSegments: "/catch-all/[...pathParams]",
+    optionalCatchAllSegments: "/catch-all-optional/[[...pathParams]]",
+});
+test("routeToUrl", async () => {
+    const xml = await createSitemapGenerator({})
+        .add("index", async () => ({ loc: routeToUrl("index", {}) }))
+        .add("catchAllSegments", async () => ({ loc: routeToUrl("catchAllSegments", { pathParams: ["param-1"] }) }))
+        .add("optionalCatchAllSegments", async () => ({
+        loc: routeToUrl("optionalCatchAllSegments", { pathParams: ["param-1", "param-2"] }),
+        priority: 10,
+    }))
+        .toXml();
+    expect(xml).toBe(`<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+    <url>
+        <loc>/</loc>
+    </url>
+    <url>
+        <loc>/catch-all/param-1</loc>
+    </url>
+    <url>
+        <loc>/catch-all-optional/param-1/param-2</loc>
+        <priority>10</priority>
+    </url>
+</urlset>`);
+});

package/utils/object-to-xml.d.ts

@@ -0,0 +1 @@
+export declare function objectToXml(object: Record<string, string | number | null | undefined>): string;

package/utils/object-to-xml.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.objectToXml = void 0;
+function objectToXml(object) {
+    return Object.entries(object)
+        .filter(([, value]) => value !== null && value !== undefined)
+        .map(([key, value]) => `        <${key}>${value}</${key}>`)
+        .join("\n");
+}
+exports.objectToXml = objectToXml;