@websolutespa/bom-mixer-models 1.8.2 → 1.8.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-mixer-models
 
+## 1.8.4
+
+### Patch Changes
+
+- Modified: sitemapHandler added escapeHtml
+
+## 1.8.3
+
+### Patch Changes
+
+- Modified: sitemapHandler added encodeURI
+
 ## 1.8.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -210,6 +210,7 @@ type ISiteMap = {
     updatedAt?: Date;
 };
 declare function getSiteMapIndex(origin: string): Promise<string>;
+declare function escapeHtml(string: string): string;
 declare function getSiteMapXML(origin: string, marketId?: string, localeId?: string): Promise<string>;
 declare function getSiteMapXSL(localeId?: string): Promise<string>;
 
@@ -333,4 +334,4 @@ declare function resolveStructuredDataOrganization(page: IPage, brand?: IBrand):
 declare function resolveStructuredDataBrand(page: IPage, brand?: IBrand): StructuredDataBrand;
 declare function resolveStructuredData(page: IPage, types?: Partial<StructuredDataCollections>, brand?: IBrand): string | undefined;
 
-export { IAddress, IAddressOptions, IAppProps, IApplication, IApplicationProps, IBrand, ICompanyAddress, IFeatureType, ILazyComponent, ILazyComponentFunc, ILazyComponentProps, ILazyFuncProps, ILazyModules, ILazyProps, ILazyStaticProps, ILazyStaticPropsFunc, ILazyableProps, ILazyedProps, ILink, IModelStore, INullableLazyableProps, ISiteMap, LAZY_PROPS, NotFound, PartialPageProps, SeoWeight, StaticPath, StructuredDataAddress, StructuredDataArticle, StructuredDataBrand, StructuredDataCollections, StructuredDataEvent, StructuredDataKeys, StructuredDataOffer, StructuredDataOrganization, StructuredDataPerformingGroup, StructuredDataPerson, StructuredDataPlace, StructuredDataProduct, categoryToRouteLink, findManyPages, findOnePage, getAddressOptions, getBreadcrumbFromSegments, getCaptionsVttProps, getCategories, getCategory, getCountries, getCountry, getDecoratedComponents, getErrorPageLayout, getFeatureType, getFeatureTypes, getLabel, getLabels, getLayout, getLocale, getLocaleFromProps, getLocales, getMarket, getMarkets, getMenu, getMenus, getPage, getPageCategory, getPageProps, getPageRoutes, getPreviewProps, getProvince, getProvinces, getPublicUrl, getRedirect, getRedirects, getRegion, getRegions, getRoute, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSeoWeight, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, newRouteLink, redirectTo, resolveHref, resolveLabel, resolveMediaSrc, resolveRoute, resolveStructuredData, resolveStructuredDataArticle, resolveStructuredDataBrand, resolveStructuredDataOrganization, resolveStructuredDataProduct, resolveTemplate, routeInterceptor, routeRevalidateHandler, routeToRouteLink, withLazyProps };
+export { IAddress, IAddressOptions, IAppProps, IApplication, IApplicationProps, IBrand, ICompanyAddress, IFeatureType, ILazyComponent, ILazyComponentFunc, ILazyComponentProps, ILazyFuncProps, ILazyModules, ILazyProps, ILazyStaticProps, ILazyStaticPropsFunc, ILazyableProps, ILazyedProps, ILink, IModelStore, INullableLazyableProps, ISiteMap, LAZY_PROPS, NotFound, PartialPageProps, SeoWeight, StaticPath, StructuredDataAddress, StructuredDataArticle, StructuredDataBrand, StructuredDataCollections, StructuredDataEvent, StructuredDataKeys, StructuredDataOffer, StructuredDataOrganization, StructuredDataPerformingGroup, StructuredDataPerson, StructuredDataPlace, StructuredDataProduct, categoryToRouteLink, escapeHtml, findManyPages, findOnePage, getAddressOptions, getBreadcrumbFromSegments, getCaptionsVttProps, getCategories, getCategory, getCountries, getCountry, getDecoratedComponents, getErrorPageLayout, getFeatureType, getFeatureTypes, getLabel, getLabels, getLayout, getLocale, getLocaleFromProps, getLocales, getMarket, getMarkets, getMenu, getMenus, getPage, getPageCategory, getPageProps, getPageRoutes, getPreviewProps, getProvince, getProvinces, getPublicUrl, getRedirect, getRedirects, getRegion, getRegions, getRoute, getRouteLinkTree, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getSeoWeight, getSiteMapIndex, getSiteMapIndexProps, getSiteMapXML, getSiteMapXMLProps, getSiteMapXSL, getSiteMapXSLProps, getStaticPathsForSchema, newRouteLink, redirectTo, resolveHref, resolveLabel, resolveMediaSrc, resolveRoute, resolveStructuredData, resolveStructuredDataArticle, resolveStructuredDataBrand, resolveStructuredDataOrganization, resolveStructuredDataProduct, resolveTemplate, routeInterceptor, routeRevalidateHandler, routeToRouteLink, withLazyProps };

package/dist/index.js

@@ -23,6 +23,7 @@ __export(src_exports, {
   LAZY_PROPS: () => LAZY_PROPS,
   NotFound: () => NotFound,
   categoryToRouteLink: () => categoryToRouteLink,
+  escapeHtml: () => escapeHtml,
   findManyPages: () => findManyPages,
   findOnePage: () => findOnePage,
   getAddressOptions: () => getAddressOptions,
@@ -822,32 +823,71 @@ async function getSiteMapIndex(origin) {
 <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 ${sitemaps.map((sitemap) => `
   <sitemap>
-    <loc>${origin}${sitemap.id}</loc>${sitemap.updatedAt ? `
-    <lastmod>${sitemap.updatedAt}</lastmod>` : ""}
+    <loc>${escapeHtml(encodeURI(`${origin}${sitemap.id}`))}</loc>${sitemap.updatedAt ? `
+    <lastmod>${escapeHtml(String(sitemap.updatedAt))}</lastmod>` : ""}
   </sitemap>
 `).join("")}
 </sitemapindex>`;
 }
 function getSiteMapXMLLastMod(canonical) {
   return canonical.updatedAt ? `
-    <lastmod>${canonical.updatedAt}</lastmod>` : "";
+    <lastmod>${escapeHtml(String(canonical.updatedAt))}</lastmod>` : "";
 }
 function getSiteMapXMLImage(canonical) {
   return canonical.media ? `
     <image:image>
-      <image:loc>${canonical.media.src || canonical.media.url}</image:loc>
+      <image:loc>${escapeHtml(encodeURI(`${canonical.media.src || canonical.media.url}`))}</image:loc>
     </image:image>` : "";
 }
 function getSiteMapXMLAlternates(origin, canonical) {
   return canonical.alternates.map((alternate) => `
-    <xhtml:link href="${origin}${alternate.id}" hreflang="${alternate.locale}-${alternate.market}" rel="alternate" />`).join("");
+    <xhtml:link href="${escapeHtml(encodeURI(`${origin}${alternate.id}`))}" hreflang="${alternate.locale}-${alternate.market}" rel="alternate" />`).join("");
 }
 function getSiteMapXMLUrl(origin, canonical) {
   return `
   <url>
-    <loc>${origin}${canonical.id}</loc>${getSiteMapXMLLastMod(canonical)}${getSiteMapXMLAlternates(origin, canonical)}${getSiteMapXMLImage(canonical)}
+    <loc>${escapeHtml(encodeURI(`${origin}${canonical.id}`))}</loc>${getSiteMapXMLLastMod(canonical)}${getSiteMapXMLAlternates(origin, canonical)}${getSiteMapXMLImage(canonical)}
   </url>`;
 }
+function escapeHtml(string) {
+  const matchHtmlRegExp = /["'&<>]/;
+  const str = "" + string;
+  const match = matchHtmlRegExp.exec(str);
+  if (!match) {
+    return str;
+  }
+  let escape;
+  let html = "";
+  let index = 0;
+  let lastIndex = 0;
+  for (index = match.index; index < str.length; index++) {
+    switch (str.charCodeAt(index)) {
+      case 34:
+        escape = "&quot;";
+        break;
+      case 38:
+        escape = "&amp;";
+        break;
+      case 39:
+        escape = "&#39;";
+        break;
+      case 60:
+        escape = "&lt;";
+        break;
+      case 62:
+        escape = "&gt;";
+        break;
+      default:
+        continue;
+    }
+    if (lastIndex !== index) {
+      html += str.substring(lastIndex, index);
+    }
+    lastIndex = index + 1;
+    html += escape;
+  }
+  return lastIndex !== index ? html + str.substring(lastIndex, index) : html;
+}
 function getSiteMapXMLUrls(origin, canonicalRoutes) {
   return canonicalRoutes.map((canonicalRoute) => getSiteMapXMLUrl(origin, canonicalRoute)).join("");
 }
@@ -1203,6 +1243,7 @@ function resolveStructuredData(page, types, brand) {
   LAZY_PROPS,
   NotFound,
   categoryToRouteLink,
+  escapeHtml,
   findManyPages,
   findOnePage,
   getAddressOptions,

package/dist/index.mjs

@@ -729,32 +729,71 @@ async function getSiteMapIndex(origin) {
 <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 ${sitemaps.map((sitemap) => `
   <sitemap>
-    <loc>${origin}${sitemap.id}</loc>${sitemap.updatedAt ? `
-    <lastmod>${sitemap.updatedAt}</lastmod>` : ""}
+    <loc>${escapeHtml(encodeURI(`${origin}${sitemap.id}`))}</loc>${sitemap.updatedAt ? `
+    <lastmod>${escapeHtml(String(sitemap.updatedAt))}</lastmod>` : ""}
   </sitemap>
 `).join("")}
 </sitemapindex>`;
 }
 function getSiteMapXMLLastMod(canonical) {
   return canonical.updatedAt ? `
-    <lastmod>${canonical.updatedAt}</lastmod>` : "";
+    <lastmod>${escapeHtml(String(canonical.updatedAt))}</lastmod>` : "";
 }
 function getSiteMapXMLImage(canonical) {
   return canonical.media ? `
     <image:image>
-      <image:loc>${canonical.media.src || canonical.media.url}</image:loc>
+      <image:loc>${escapeHtml(encodeURI(`${canonical.media.src || canonical.media.url}`))}</image:loc>
     </image:image>` : "";
 }
 function getSiteMapXMLAlternates(origin, canonical) {
   return canonical.alternates.map((alternate) => `
-    <xhtml:link href="${origin}${alternate.id}" hreflang="${alternate.locale}-${alternate.market}" rel="alternate" />`).join("");
+    <xhtml:link href="${escapeHtml(encodeURI(`${origin}${alternate.id}`))}" hreflang="${alternate.locale}-${alternate.market}" rel="alternate" />`).join("");
 }
 function getSiteMapXMLUrl(origin, canonical) {
   return `
   <url>
-    <loc>${origin}${canonical.id}</loc>${getSiteMapXMLLastMod(canonical)}${getSiteMapXMLAlternates(origin, canonical)}${getSiteMapXMLImage(canonical)}
+    <loc>${escapeHtml(encodeURI(`${origin}${canonical.id}`))}</loc>${getSiteMapXMLLastMod(canonical)}${getSiteMapXMLAlternates(origin, canonical)}${getSiteMapXMLImage(canonical)}
   </url>`;
 }
+function escapeHtml(string) {
+  const matchHtmlRegExp = /["'&<>]/;
+  const str = "" + string;
+  const match = matchHtmlRegExp.exec(str);
+  if (!match) {
+    return str;
+  }
+  let escape;
+  let html = "";
+  let index = 0;
+  let lastIndex = 0;
+  for (index = match.index; index < str.length; index++) {
+    switch (str.charCodeAt(index)) {
+      case 34:
+        escape = "&quot;";
+        break;
+      case 38:
+        escape = "&amp;";
+        break;
+      case 39:
+        escape = "&#39;";
+        break;
+      case 60:
+        escape = "&lt;";
+        break;
+      case 62:
+        escape = "&gt;";
+        break;
+      default:
+        continue;
+    }
+    if (lastIndex !== index) {
+      html += str.substring(lastIndex, index);
+    }
+    lastIndex = index + 1;
+    html += escape;
+  }
+  return lastIndex !== index ? html + str.substring(lastIndex, index) : html;
+}
 function getSiteMapXMLUrls(origin, canonicalRoutes) {
   return canonicalRoutes.map((canonicalRoute) => getSiteMapXMLUrl(origin, canonicalRoute)).join("");
 }
@@ -1109,6 +1148,7 @@ export {
   LAZY_PROPS,
   NotFound,
   categoryToRouteLink,
+  escapeHtml,
   findManyPages,
   findOnePage,
   getAddressOptions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-models",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "Mixer Models module of the BOM Repository",
   "keywords": [
     "bom",

package/src/sitemap/sitemap.service.ts

@@ -31,8 +31,8 @@ export async function getSiteMapIndex(origin: string): Promise<string> {
 <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 ${sitemaps.map(sitemap => `
   <sitemap>
-    <loc>${origin}${sitemap.id}</loc>${sitemap.updatedAt ? `
-    <lastmod>${sitemap.updatedAt}</lastmod>` : ''}
+    <loc>${escapeHtml(encodeURI(`${origin}${sitemap.id}`))}</loc>${sitemap.updatedAt ? `
+    <lastmod>${escapeHtml(String(sitemap.updatedAt))}</lastmod>` : ''}
   </sitemap>
 `).join('')}
 </sitemapindex>`;
@@ -40,28 +40,79 @@ ${sitemaps.map(sitemap => `
 
 function getSiteMapXMLLastMod(canonical: IRouteCanonical): string {
   return canonical.updatedAt ? `
-    <lastmod>${canonical.updatedAt}</lastmod>` : '';
+    <lastmod>${escapeHtml(String(canonical.updatedAt))}</lastmod>` : '';
 }
 
 function getSiteMapXMLImage(canonical: IRouteCanonical): string {
   return canonical.media ? `
     <image:image>
-      <image:loc>${canonical.media.src || canonical.media.url}</image:loc>
+      <image:loc>${escapeHtml(encodeURI(`${canonical.media.src || canonical.media.url}`))}</image:loc>
     </image:image>` : '';
 }
 
 function getSiteMapXMLAlternates(origin: string, canonical: IRouteCanonical): string {
   return canonical.alternates.map(alternate => `
-    <xhtml:link href="${origin}${alternate.id}" hreflang="${alternate.locale}-${alternate.market}" rel="alternate" />`).join('');
+    <xhtml:link href="${escapeHtml(encodeURI(`${origin}${alternate.id}`))}" hreflang="${alternate.locale}-${alternate.market}" rel="alternate" />`).join('');
 }
 
 function getSiteMapXMLUrl(origin: string, canonical: IRouteCanonical): string {
   return `
   <url>
-    <loc>${origin}${canonical.id}</loc>${getSiteMapXMLLastMod(canonical)}${getSiteMapXMLAlternates(origin, canonical)}${getSiteMapXMLImage(canonical)}
+    <loc>${escapeHtml(encodeURI(`${origin}${canonical.id}`))}</loc>${getSiteMapXMLLastMod(canonical)}${getSiteMapXMLAlternates(origin, canonical)}${getSiteMapXMLImage(canonical)}
   </url>`;
 }
 
+/*
+Character	    Escape    Code
+Ampersand	    &	        &amp;
+Single Quote	'	        &apos;
+Double Quote	"	        &quot;
+Greater Than	>	        &gt;
+Less Than	    <	        &lt;
+*/
+
+export function escapeHtml(string: string) {
+  const matchHtmlRegExp = /["'&<>]/;
+  const str = '' + string;
+  const match = matchHtmlRegExp.exec(str);
+  if (!match) {
+    return str;
+  }
+  let escape: string;
+  let html = '';
+  let index = 0;
+  let lastIndex = 0;
+  for (index = match.index; index < str.length; index++) {
+    switch (str.charCodeAt(index)) {
+      case 34: // "
+        escape = '&quot;';
+        break;
+      case 38: // &
+        escape = '&amp;';
+        break;
+      case 39: // '
+        escape = '&#39;';
+        break;
+      case 60: // <
+        escape = '&lt;';
+        break;
+      case 62: // >
+        escape = '&gt;';
+        break;
+      default:
+        continue;
+    }
+    if (lastIndex !== index) {
+      html += str.substring(lastIndex, index);
+    }
+    lastIndex = index + 1;
+    html += escape;
+  }
+  return lastIndex !== index
+    ? html + str.substring(lastIndex, index)
+    : html;
+}
+
 function getSiteMapXMLUrls(origin: string, canonicalRoutes: IRouteCanonical[]): string {
   return canonicalRoutes.map((canonicalRoute) => getSiteMapXMLUrl(origin, canonicalRoute)).join('');
 }