improve: core

Author: Alexander Yukal

lib/gulp-json-loader.js

@@ -17,26 +17,14 @@ const Fs = require('fs');
 const APP_PATH = process.cwd();
 const DEFAULT_SOURCE_PATH = 'src';
 const BREAK_LINE = process.platform === 'win32' ? '\r\n' : '\n';
-const ERR_TOP_DIR = 'Working with external paths is prohibited!';
+const ERR_EXTERNAL_PATH = 'Working with external paths is prohibited!';
 
 const BrushColors = {
   red: 1,
   cyan: 6,
   grey: 8
 };
 
-const getAbsolutePath = (path, subdir = '') => {
-  if (path.startsWith('/')) {
-    path = '.' + path;
-  }
-
-  path = Path.join(APP_PATH, path);
-
-  return subdir
-    ? Path.join(path, subdir)
-    : path;
-}
-
 /**
  * brush
  * Adding the ANSI escape codes to a textual data
@@ -75,19 +63,36 @@ const reportAction = (ctx, pathJson, filename, action) => {
   process.stdout.write(message);
 }
 
-const loadImportsAsync = (ctx, imports, CachedData) => {
+const loadImportsAsync = (ctx, imports, cachedData) => {
   return new Promise((resolve, reject) => {
     if (!Array.isArray(imports)) {
+
       reject(new Error('Imports should be an Array'));
+
     } else {
-      const pocket = {};
-      loadImportsRecursively({ ctx, imports, pocket, CachedData, resolve, reject });
+
+      if (imports.length < 1) {
+        resolve({});
+        return;
+      }
+
+      const options = { ctx, imports, cachedData, pocket: {} };
+
+      loadImportsRecursively(options, (error, pocket) => {
+        if (error !== null) {
+          reject(error);
+          return;
+        }
+
+        resolve(pocket);
+      });
+
     }
   });
 };
 
-const loadImportsRecursively = async (options) => {
-  const { ctx, imports, pocket, CachedData, resolve, reject, idx = 0 } = options;
+const loadImportsRecursively = async (options, callback) => {
+  const { ctx, imports, cachedData, pocket, idx = 0 } = options;
   const { report, pathData } = ctx;
 
   if (idx < imports.length) {
@@ -99,21 +104,21 @@ const loadImportsRecursively = async (options) => {
     const cacheKey = jsonFullPath.replace(`${APP_PATH}/`, '');
 
     if (!jsonFullPath.startsWith(APP_PATH)) {
-      reject(new Error(ERR_TOP_DIR));
+      callback(new Error(ERR_EXTERNAL_PATH), null);
       return;
     }
 
-    if (!CachedData.hasOwnProperty(cacheKey)) {
+    if (!cachedData.hasOwnProperty(cacheKey)) {
       try {
 
         const jsonData = await Fs.promises.readFile(jsonFullPath, 'utf8');
 
-        CachedData[cacheKey] = JSON.parse(jsonData);
+        cachedData[cacheKey] = JSON.parse(jsonData);
         action = 'Loaded';
 
       } catch (error) {
 
-        reject(error);
+        callback(error, null);
         return;
 
       }
@@ -122,52 +127,52 @@ const loadImportsRecursively = async (options) => {
     report && reportAction(ctx, jsonFullPath, jsonFilename, action);
 
     Object.defineProperty(pocket, jsonFilename, {
-      value: CachedData[cacheKey],
+      value: cachedData[cacheKey],
       enumerable: true
     });
 
     options.idx = idx + 1;
-    loadImportsRecursively(options);
+    loadImportsRecursively(options, callback);
 
-  } else {
-    resolve(pocket);
+  } else if (callback !== undefined) {
+    callback(null, pocket);
   }
 }
 
 async function loadJsonData(file) {
-  const { report, pathHtml, pathData, dataEntry, CachedData } = this;
+  const { report, pathHtml, pathData, dataEntry, cachedData } = this;
 
-  const pathJson = file.path
+  const jsonFullPath = file.path
     .replace(pathHtml, `${pathData}/pages`)
     .slice(0, -3) + 'json';
 
-  const cacheKey = pathJson.replace(`${APP_PATH}/`, '');
+  const cacheKey = jsonFullPath.replace(`${APP_PATH}/`, '');
 
   const filename = Path.basename(file.path, '.pug');
   const pocket = { filename };
 
-  if (CachedData.hasOwnProperty(cacheKey)) {
-    report && reportAction(this, pathJson, filename, 'Cached');
-    return CachedData[cacheKey];
+  if (cachedData.hasOwnProperty(cacheKey)) {
+    report && reportAction(this, jsonFullPath, filename, 'Cached');
+    return cachedData[cacheKey];
   }
 
   let jsonData = '';
 
   try {
-    jsonData = await Fs.promises.readFile(pathJson, 'utf8');
+    jsonData = await Fs.promises.readFile(jsonFullPath, 'utf8');
     jsonData = JSON.parse(jsonData);
   } catch (err) {
     return pocket;
   }
 
-  report && reportAction(this, pathJson, filename, 'Loaded');
+  report && reportAction(this, jsonFullPath, filename, 'Loaded');
 
   if (jsonData.hasOwnProperty('imports')) {
     const { data = {}, imports = [] } = jsonData;
 
     try {
 
-      const importedData = await loadImportsAsync(this, imports, CachedData);
+      const importedData = await loadImportsAsync(this, imports, cachedData);
 
       Object.defineProperty(data, 'imports', {
         value: importedData,
@@ -179,7 +184,7 @@ async function loadJsonData(file) {
       const coloredErrorMesage = brush('red', err.message);
       process.stderr.write(coloredErrorMesage + BREAK_LINE);
 
-      return;
+      return pocket;
 
     }
 
@@ -189,7 +194,7 @@ async function loadJsonData(file) {
     });
   }
 
-  CachedData[cacheKey] = pocket;
+  cachedData[cacheKey] = pocket;
 
   return pocket;
 }
@@ -211,29 +216,36 @@ const factory = (options, testMode = false) => {
     : DEFAULT_SOURCE_PATH;
 
   const pathHtml = options.hasOwnProperty('pathHtml')
-    ? getAbsolutePath(options.pathHtml)
-    : getAbsolutePath(sourcePath, 'html');
+    ? Path.join(APP_PATH, options.pathHtml)
+    : Path.join(APP_PATH, sourcePath, 'html');
 
   const pathData = options.hasOwnProperty('pathData')
-    ? getAbsolutePath(options.pathData)
-    : getAbsolutePath(sourcePath, 'data');
+    ? Path.join(APP_PATH, options.pathData)
+    : Path.join(APP_PATH, sourcePath, 'data');
 
   if (!pathHtml.startsWith(APP_PATH) || !pathData.startsWith(APP_PATH)) {
     // Please put your source files into your project directory.
-    throw new Error(ERR_TOP_DIR);
+    throw new Error(ERR_EXTERNAL_PATH);
   }
 
-  const bindData = {
+  const context = {
     sourcePath,
     pathHtml,
     pathData,
     dataEntry,
     locales,
     report,
-    CachedData: {}
+    cachedData: {}
   };
 
-  return testMode ? bindData : loadJsonData.bind(bindData);
+  if (testMode) {
+    return {
+      context,
+      loader: loadJsonData.bind(context),
+    }
+  }
+
+  return loadJsonData.bind(context);
 }
 
 factory.forTest = () => {
@@ -245,10 +257,9 @@ factory.forTest = () => {
       APP_PATH,
       DEFAULT_SOURCE_PATH,
       BREAK_LINE,
-      ERR_TOP_DIR,
+      ERR_EXTERNAL_PATH,
     },
 
-    getAbsolutePath,
     brush,
     reportAction,
     loadImportsAsync,