Merge branch 'assets-folder-fix' into marqdevx/assets-folder-recognition-update

Author: sebromero

domain/article.js

@@ -23,6 +23,7 @@ export class Article {
         this._codeBlockData = null;
         this._referencedAssetsPaths = null;
         this._emphasizedTextData = null;
+        this._assetFolder = null;
     }
 
     /**
@@ -259,28 +260,20 @@ export class Article {
      */
     get assetsFolder(){
         if(this._assetFolder) return this._assetFolder;
-        const validDirectories = ["assets", "images"];
 
-        if (existsSync(`${this.path}/${validDirectories[0]}/`)){
-            this._assetFolder = validDirectories[0];
-            return this._assetFolder;
-        }
-        if (existsSync(`${this.path}/${validDirectories[1]}/`)){
-            console.log("😬 WARNING: Using deprecated 'images' directory to store assets. Location:", this.path);
-            this._assetFolder = validDirectories[1];
-            return this._assetFolder;
-        }        
-
-        // Try to figure out assets path from the referenced images
+        // Figure out assets path(s) from the referenced images
         const usedAssetPaths = this.referencedImages.map((assetPath) => {
             const directory = path.dirname(assetPath)
             if(!directory) return null;
             return directory.split("/")[0];
-        })
+        });
 
         const uniqueAssetPaths = usedAssetPaths.filter((element, index) => { return usedAssetPaths.indexOf(element) == index; });
-        if(uniqueAssetPaths.length == 1) return uniqueAssetPaths[0];
-        return null;
+        if(uniqueAssetPaths.length == 1) {
+            this._assetFolder = uniqueAssetPaths[0];
+        }
+
+        return this._assetFolder;
     }
 
     /**

validations/assets.js

@@ -86,14 +86,21 @@ function validateSVGFiles(article){
 /**
  * Checks if the article uses one of the allowed assets folder name.
  * @param {Article} article 
+ * @param {String} expectedFolderName the expected assets folder name
  * @returns an array of ValidationIssue objects for the found issues.
  */
-function validateAssetsFolderName(article){
+function validateAssetsFolderName(article, expectedFolderName){
 
-    if(article.assets.length > 0 && article.assetsFolder != "assets"){
-        const errorMessage = "No standard assets directory found";
-        return new ValidationIssue(errorMessage, article.contentFilePath, ValidationIssue.Type.WARNING);
+    if(article.assets.length > 0 && article.assetsFolder === null){
+        const errorMessage = "Multiple asset directories used";
+        return new ValidationIssue(errorMessage, article.contentFilePath);
     }
+
+    if(article.assetsFolder !== expectedFolderName){
+        const errorMessage = "Unexpected or deprecated assets directory used";
+        return new ValidationIssue(errorMessage, article.contentFilePath,  ValidationIssue.Type.WARNING);
+    }     
+
     return [];
 }