@videinfra/static-website-builder 1.15.3 → 1.15.5

package/init/test/.env

@@ -3,3 +3,4 @@ FOO=foo-global
 TYPE_BOOL_TRUE=true
 TYPE_BOOL_FALSE=false
 TYPE_NUMBER=123.456
+TYPE_EMPTY=

package/init/test/config/config.js

@@ -31,6 +31,9 @@ exports.plugins = [
 
     // Enables TwigJS engine .twig file compilation
     require('../../../plugins/twig'),
+
+    // Enables TWIG Symfony filters
+    require('../../../plugins/twig/symfony-filters'),
 ];
 
 exports.env = {
@@ -41,6 +44,7 @@ exports.env = {
         'TYPE_BOOL_TRUE': 'typeBoolTrue',
         'TYPE_BOOL_FALSE': 'typeBoolFalse',
         'TYPE_NUMBER': 'typeNumber',
+        'TYPE_EMPTY': 'typeEmpty',
     },
 };
 

package/init/test/src/html/preposition.twig

@@ -0,0 +1,4 @@
+
+{% extends 'layouts/base.twig' %}
+
+{% block body %}{{ 'hello at world' | preposition_nbsp }}{% endblock %}

package/init/test/src/stylesheets/env-test.scss

@@ -3,10 +3,11 @@
 }
 
 :root {
-    #{ --env-test-type-number }: map-get($env, type-number);
+    #{ --env-test-type-number }: map-get($env, typeNumber);
+    #{ --env-test-type-empty }: map-get($env, typeEmpty);
 }
 
-@if map-get($env, type-bool-true) {
+@if map-get($env, typeBoolTrue) {
     :root {
         --env-test-bool-true: true;
     }
@@ -16,7 +17,7 @@
     }
 }
 
-@if map-get($env, type-bool-false) {
+@if map-get($env, typeBoolFalse) {
     :root {
         --env-test-bool-false: true;
     }

package/package.json

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

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

@@ -78,5 +78,21 @@ module.exports.push({
     }
 });
 
+/**
+ * Preposition filter
+ * Adds a non-breaking space between prepositions and other words
+ *
+ * @example
+ *   {{ 'hello at world' | preposition_nbsp }}
+ *   Output: hello at world
+ */
+
+const preposition_nbsp = require('./preposition_nbsp');
 
+module.exports.push({
+    name: 'preposition_nbsp',
+    func: function (text) {
+        return preposition_nbsp(text);
+    }
+});
 

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

@@ -0,0 +1,28 @@
+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;
+
+let prepositionsRegex = null;
+
+function escapeRegExp(string) {
+    return string.replace(regexEscape, '\\$&'); // $& means the whole matched string
+}
+
+function prepositionNbsp(text) {
+    if (!prepositionsRegex) {
+        const prepositionsEscaped = prepositions.map(preposition => escapeRegExp(preposition));
+        prepositionsRegex = new RegExp(`${regexWordBoundary}(${prepositionsEscaped.join('|')})\\s+`, 'uig');
+    }
+
+    return text.replace(prepositionsRegex, '$2&nbsp;');
+}
+
+module.exports = prepositionNbsp;

package/tasks/env/get-env.js

@@ -46,7 +46,7 @@ function getEnvData () {
         if (key in envVariables) {
             const value = envVariables[key];
             const camelCase = map[key];
-            const kebabCase = map[key].replace(/([a-z])([A-Z])/g, '$1-$2').replace(/_([a-z])/ig, '-$1').toLowerCase();
+            const kebabCase = map[key];
             twigVariables[camelCase] = normalizeTwigVariable(value);
             envOutVariables[camelCase] = value;
             jsVariables[`process.env.${ camelCase }`] = escapeJSVariable(value);

package/tasks/html/task.js

@@ -40,10 +40,12 @@ const getWatchGlobPaths = memoize(function () {
     const sourcePaths = getPaths.getSourcePaths('html');
     const extensions = getConfig.getTaskConfig('html', 'extensions');
     const dataExtensions = getConfig.getTaskConfig('data', 'extensions');
+    const envFiles = getPaths.getPathConfig().env.map((path) => getPaths.getProjectPath(path))
 
     return globs.generate(
         globs.paths(sourcePaths).filesWithExtensions(extensions),     // HTML / TWIG files
-        globs.paths(sourcePaths).filesWithExtensions(dataExtensions)  // Data files
+        globs.paths(sourcePaths).filesWithExtensions(dataExtensions),  // Data files
+        envFiles, // env files
     );
 });
 

package/tests/build/build.test.js

@@ -114,6 +114,7 @@ test('.env and .env.local files loaded', () => {
             expect(css.indexOf('--env-test-bool-true:true')).not.toBe(-1);
             expect(css.indexOf('--env-test-bool-false:false')).not.toBe(-1);
             expect(css.indexOf('--env-test-type-number:123.456')).not.toBe(-1);
+            expect(css.indexOf('--env-test-type-empty:""')).not.toBe(-1);
         }),
     ]);
 });

package/tests/preposition_nbsp.test.js

@@ -0,0 +1,28 @@
+const path = require('path');
+const publicPath = path.resolve(__dirname, 'build', 'public');
+const fs = require('fs')
+const fsPromises = fs.promises;
+
+const preposition_nbsp = require('../plugins/twig/symfony-filters/preposition_nbsp');
+
+test('preposition_nbsp english', () => {
+    expect(preposition_nbsp('hello world')).toEqual('hello world');
+    expect(preposition_nbsp('hello at')).toEqual('hello at');
+    expect(preposition_nbsp('hello at. world')).toEqual('hello at. world');
+    expect(preposition_nbsp('hello at world')).toEqual('hello at world');
+    expect(preposition_nbsp('hello before at world')).toEqual('hello before at world');
+});
+
+test('preposition_nbsp russian', () => {
+    expect(preposition_nbsp('ппппп дддд')).toEqual('ппппп дддд');
+    expect(preposition_nbsp('ппппп над')).toEqual('ппппп над');
+    expect(preposition_nbsp('ппппп над. дддд')).toEqual('ппппп над. дддд');
+    expect(preposition_nbsp('ппппп над дддд')).toEqual('ппппп над дддд');
+    expect(preposition_nbsp('ппппп before над дддд')).toEqual('ппппп before над дддд');
+});
+
+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>');
+    });
+});