@videinfra/static-website-builder 1.15.9 → 1.15.11

package/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.15.11] - 2025-10-08
+- Updated "preposition_nbsp" TWIG filter
+
+## [1.15.10] - 2025-09-26
+- Updated "preposition_nbsp" TWIG filter
+
 ## [1.15.9] - 2025-09-10
 - Added dashes to the "preposition_nbsp" TWIG filter
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@videinfra/static-website-builder",
-  "version": "1.15.9",
+  "version": "1.15.11",
   "description": "Customizable static site project builder",
   "license": "MIT",
   "engines": {

package/plugins/twig/symfony-filters/preposition_nbsp.js

@@ -1,14 +1,16 @@
 const prepositions = [
     'about', 'above', 'across', 'after', 'against', 'along', 'amid', 'among', 'around', 'as', 'at', 'before', 'behind', 'below', 'beneath', 'beside', 'besides', 'between', 'beyond', 'by', 'concerning', 'despite', 'down', 'during', 'except', 'for', 'from', 'in', 'inside', 'into', 'like', 'near', 'of', 'off', 'on', 'onto', 'out', 'outside', 'over', 'past', 'regarding', 'round', 'since', 'through', 'throughout', 'to', 'toward', 'towards', 'under', 'underneath', 'until', 'unto', 'up', 'upon', 'with', 'within', 'without', 'a', 'an', 'the',
-    'в', 'на', 'по', 'к', 'у', 'от', 'из', 'с', 'над', 'под', 'при', 'без', 'до', 'для', 'за', 'через', 'перед', 'около', 'вокруг', 'о', 'об', 'обо', 'про', 'среди', 'между', 'ради', 'вдоль', 'вне', 'кроме', 'сквозь', 'вследствие', 'благодаря', 'согласно', 'вопреки', 'вроде', 'насчёт', 'касательно', 'против', 'со', 'во', 'ко', 'ото', 'изо', 'надо', 'подо', 'передо', 'передо', 'и'
+    'в', 'на', 'по', 'к', 'у', 'от', 'из', 'с', 'над', 'под', 'при', 'без', 'до', 'для', 'за', 'через', 'перед', 'около', 'вокруг', 'о', 'об', 'обо', 'про', 'среди', 'между', 'ради', 'вдоль', 'вне', 'кроме', 'сквозь', 'вследствие', 'благодаря', 'согласно', 'вопреки', 'вроде', 'насчёт', 'касательно', 'со', 'против', 'во', 'ко', 'ото', 'изо', 'надо', 'подо', 'передо', 'передо', 'из-за', 'чтобы', 'когда', 'его', 'которое', 'как', 'и', 'ей', 'они', 'мы', 'или', 'всё', 'я', 'которое', 'вашей', 'эти', 'что', 'вам', 'не уверены', 'а', 'вы', 'этим', 'вашим', 'все', 'если', 'о которой', 'в этом', 'но', 'которые', 'же', 'ваш', 'этой'
 ];
 
+
 // Word boundary regex
 //     (?<=         # Lookbehind, but don't consume
 //     (^|          # Start of string or
 //     [^\\p{L}]    # Non-letter, works with unicode characters too
 const regexWordBoundary = '(?<=(^|[^\\p{L}]))';
 const regexEscape = /[.*+?^${}()|[\]\\]/g;
+const regexSplitTags = /<[^>]+>/ug;
 
 const regexMdash = /\s+—/uig;
 const regexNdash = /\s+–/uig;
@@ -21,6 +23,7 @@ const regexNdashEntity = /\s+&ndash;/uig;
 const regexHyphenEntity = /\s+&#45;/uig;
 const regexHyphen2Entity = /\s+&hyphen;/uig;
 const regexFigureDashEntity = /\s+&#x2012;/uig;
+const regexDashEntity = /\s+&dash;/uig;
 
 let prepositionsRegex = null;
 
@@ -29,26 +32,46 @@ function escapeRegExp(string) {
 }
 
 function prepositionNbsp(text) {
+    if (!text) {
+        return '';
+    }
+
     if (!prepositionsRegex) {
         const prepositionsEscaped = prepositions.map(preposition => escapeRegExp(preposition));
         prepositionsRegex = new RegExp(`${regexWordBoundary}(${prepositionsEscaped.join('|')})\\s+`, 'uig');
     }
 
-    text = text.replace(prepositionsRegex, '$2&nbsp;');
+    // Split text into regular text and HTML tags
+    const textTags = text.match(regexSplitTags) || [];
+    const textNoTags = text.split(regexSplitTags);
+
+    // Replace prepositions in regular text
+    for (let i = 0; i < textNoTags.length; i++) {
+        let textPart = textNoTags[i];
 
-    text = text.replace(regexMdash, '&nbsp;&mdash;', text);
-    text = text.replace(regexNdash, '&nbsp;&ndash;', text);
-    text = text.replace(regexHyphen, '&nbsp;&#45;', text);
-    text = text.replace(regexHyphen2, '&nbsp;&hyphen;', text);
-    text = text.replace(regexFigureDash, '&nbsp;&#x2012;', text);
+        // Replace prepositions with non-breaking space
+        textPart = textPart.replace(prepositionsRegex, '$2&nbsp;');
 
-    text = text.replace(regexMdashEntity, '&nbsp;&mdash;', text);
-    text = text.replace(regexNdashEntity, '&nbsp;&ndash;', text);
-    text = text.replace(regexHyphenEntity, '&nbsp;&#45;', text);
-    text = text.replace(regexHyphen2Entity, '&nbsp;&hyphen;', text);
-    text = text.replace(regexFigureDashEntity, '&nbsp;&#x2012;', text);
+        textPart = textPart.replace(regexMdash, '&nbsp;&mdash;', textPart);
+        textPart = textPart.replace(regexNdash, '&nbsp;&ndash;', textPart);
+        textPart = textPart.replace(regexHyphen, '&nbsp;&#45;', textPart);
+        textPart = textPart.replace(regexHyphen2, '&nbsp;&hyphen;', textPart);
+        textPart = textPart.replace(regexFigureDash, '&nbsp;&#x2012;', textPart);
+
+        textPart = textPart.replace(regexMdashEntity, '&nbsp;&mdash;', textPart);
+        textPart = textPart.replace(regexNdashEntity, '&nbsp;&ndash;', textPart);
+        textPart = textPart.replace(regexHyphenEntity, '&nbsp;&#45;', textPart);
+        textPart = textPart.replace(regexHyphen2Entity, '&nbsp;&hyphen;', textPart);
+        textPart = textPart.replace(regexFigureDashEntity, '&nbsp;&#x2012;', textPart);
+        textPart = textPart.replace(regexDashEntity, '&nbsp;&dash;', textPart);
+
+        textNoTags[i] = textPart;
+    }
 
-    return text;
+    // Iterate over regular text and and join back together with tags
+    return textNoTags.map((text, index) => {
+        return text + (textTags[index] || '');
+    }).join('');
 }
 
 module.exports = prepositionNbsp;

package/tests/preposition_nbsp.test.js

@@ -27,6 +27,7 @@ test('preposition_nbsp hyphens', () => {
     expect(preposition_nbsp('hello - world')).toEqual('hello - world');
     expect(preposition_nbsp('hello ‐ world')).toEqual('hello ‐ world');
     expect(preposition_nbsp('hello ‒ world')).toEqual('hello ‒ world');
+    expect(preposition_nbsp('hello ‐ world')).toEqual('hello ‐ world');
 
     // Don't replace hyphens with entities if not needed
     expect(preposition_nbsp('hello— world')).toEqual('hello— world');
@@ -35,6 +36,12 @@ test('preposition_nbsp hyphens', () => {
     expect(preposition_nbsp('hello ‒ at world')).toEqual('hello ‒ at world');
 });
 
+test('preposition_nbsp skip tags', () => {
+    expect(preposition_nbsp('<a href="https://www.google.com">A nice day</a>')).toEqual('<a href="https://www.google.com">A&nbsp;nice day</a>');
+    expect(preposition_nbsp('Start <a download>This is a nice day</a> at <a download>another nice day</a>')).toEqual('Start <a download>This is a&nbsp;nice day</a> at&nbsp;<a download>another nice day</a>');
+    expect(preposition_nbsp('<link rel="preload" href="/assets/fonts/...ttf" as="font" type="font/ttf" crossorigin>')).toEqual('<link rel="preload" href="/assets/fonts/...ttf" as="font" type="font/ttf" crossorigin>');
+});
+
 test('Preposition TWIG filter applied', () => {
     return fsPromises.readFile(path.resolve(publicPath, 'preposition.html'), {'encoding': 'utf8'}).then((html) => {
         expect(html).toBe('<html><body>hello at&nbsp;world</body></html>');