@videinfra/static-website-builder 1.4.3 → 1.5.0

package/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.5.0] - 2022-04-13
+### Fixed
+- Read files in `data` folder recursively
+
 ## [1.4.3] - 2022-03-08
 ### Fixed
 - Fixed negative glob paths not working

package/lib/camelize-file-name.js

@@ -0,0 +1,21 @@
+/**
+ * Camelize filename
+ *
+ * @param {string} str File name
+ * @returns {string} Camelized name
+ */
+module.exports = function camelizeFileName (str) {
+    return str
+         // Remove extension
+        .replace(/(.+?)\..*$/ig, '$1')
+        // Remove dot
+        .replace(/\./g, '')
+        // Replace non alpha-numeric characters
+        .replace(/[^a-z0-9]/ig, ' ')
+        // Uppercase words
+        .replace(/(?:^\w|[A-Z]|\b\w)/g, function(word, index) {
+             return index === 0 ? word.toLowerCase() : word.toUpperCase();
+        })
+        // Remove empty spaces
+        .replace(/\s+/g, '');
+}

package/lib/get-file-names.js

@@ -0,0 +1,23 @@
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Returns list of filenames in folder recursively
+ *
+ * @param {string} folder Folder path
+ * @param {string} [subFolder=''] Subfolder path
+ * @returns {array} List of filenames, relative to folder
+ */
+module.exports = function getFileNamesSync (folder, subFolder = '') {
+    let fileNames = []
+
+    fs.readdirSync(folder, { withFileTypes: true }).forEach(file => {
+        if (file.isDirectory()) {
+            fileNames = fileNames.concat(getFileNamesSync(path.join(folder, file.name), path.join(subFolder, file.name)));
+        } else {
+            fileNames.push(path.join(subFolder, file.name))
+        }
+    });
+
+    return fileNames;
+}

package/package.json

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

package/tasks/data/get-data.js

@@ -1,4 +1,3 @@
-const fs = require('fs');
 const path = require('path');
 const reduce = require('lodash/reduce');
 const micromatch = require('micromatch'); // gulp dependency
@@ -7,26 +6,9 @@ const merge = require('../../lib/merge');
 const getPaths = require('../../lib/get-path');
 const getConfig = require('../../lib/get-config');
 const logError = require('../../lib/log-error');
+const getFileNamesSync = require('../../lib/get-file-names');
+const camelizeFileName = require('../../lib/camelize-file-name');
 
-/**
- * Camelize filename
- *
- * @param {string} str File name
- * @returns {string} Camelized name
- */
-function camelizeFileName (str) {
-    return str
-         // Remove extension
-        .replace(/\.[^.]+$/ig, '')
-        // Replace non alpha-numeric characters
-        .replace(/[^a-z0-9]/ig, ' ')
-        // Uppercase words
-        .replace(/(?:^\w|[A-Z]|\b\w)/g, function(word, index) {
-             return index === 0 ? word.toLowerCase() : word.toUpperCase();
-        })
-        // Remove empty spaces
-        .replace(/\s+/g, '');
-}
 
 module.exports = function getData () {
     const folders = getPaths.getSourcePaths('data');
@@ -36,7 +18,7 @@ module.exports = function getData () {
     const group = getConfig.getTaskConfig('data', 'groupByFileName');
 
     const data = reduce(folders, (data, folder) => {
-        fs.readdirSync(folder).forEach(fileName => {
+        getFileNamesSync(folder).forEach(fileName => {
             // Ignore files matching 'ignore' list
             if (ignore.length && micromatch.isMatch(fileName, ignore)) {
                 return;

package/tests/camelize-file-name.test.js

@@ -0,0 +1,11 @@
+const camelizeFileName = require('../lib/camelize-file-name');
+
+test('Camelize file name', () => {
+    expect(camelizeFileName('test-file-name')).toBe('testFileName');
+    expect(camelizeFileName('testFileName')).toBe('testFileName');
+    expect(camelizeFileName('testFile_name')).toBe('testFileName');
+    expect(camelizeFileName('test-file-name.jpg')).toBe('testFileName');
+    expect(camelizeFileName('testFileName.jpg')).toBe('testFileName');
+    expect(camelizeFileName('test-āēūīķļ-name.jpg.png')).toBe('testName');
+    expect(camelizeFileName('.gitignore')).toBe('gitignore');
+});