markdown_link_checker_sc 0.0.117 → 0.0.118

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown_link_checker_sc",
-  "version": "0.0.117",
+  "version": "0.0.118",
   "description": "Markdown Link Checker",
   "main": "index.js",
   "scripts": {

package/src/helpers.js

@@ -2,13 +2,20 @@ import fs from "fs/promises";
 import path from "path";
 import { sharedData } from "./shared_data.js";
 
+// Call at start of function to ease logging to console.
+function logFunction(name, ...args) {
+  sharedData.options.log.includes("functions")
+    ? console.log(`${name}: ${args.join(", ")}`)
+    : null;
+}
+
 // Log data to specified file path, replacing file.
 async function logToFile(filePath, dataString) {
   sharedData.options.log.includes("functions")
-  ? console.log(`Function: logToFile(${filePath}, dataString))`)
-  : null;
+    ? console.log(`Function: logToFile(${filePath}, dataString))`)
+    : null;
   if (!sharedData.options.logtofile) {
-     return;
+    return;
   }
 
   try {
@@ -48,4 +55,4 @@ function isHTML(file) {
   return fileExtension === ".html" || fileExtension === ".htm" ? true : false;
 }
 
-export { logToFile, isImage, isMarkdown, isHTML };
+export { logToFile, logFunction, isImage, isMarkdown, isHTML };

package/src/links.js

@@ -1,6 +1,7 @@
 import path from "path";
 import { isImage, isMarkdown, isHTML } from "./helpers.js";
 import { sharedData } from "./shared_data.js";
+import { logFunction } from "./helpers.js";
 
 class Link {
   address = "";
@@ -33,9 +34,7 @@ class Link {
   }
 
   constructor({ page, url, type, text, title }) {
-    sharedData.options.log.includes("functions")
-    ? console.log("Link:constructor")
-    : null;
+    logFunction("Link:constructor");
 
     if (page) {
       this.page = page;
@@ -110,9 +109,8 @@ class Link {
   // This is only used if the type is not specified as an argument.
   // Uses file extension etc, so should be run after SplitUrl() which finds the address
   findType() {
-    sharedData.options.log.includes("functions")
-    ? console.log("Link:findType()")
-    : null;
+    logFunction("Link:findType()");
+
     let linkType = "unHandledLinkType";
 
     this.isImage = this.address && isImage(this.address) ? true : false; //only if address is true.
@@ -182,9 +180,7 @@ class Link {
 
   //get absolute path to link, if this is a relative URL link.
   getAbsolutePath() {
-    sharedData.options.log.includes("functions")
-    ? console.log(`Link:getAbsolutePath: page: ${this.page}, address: ${this.address} `)
-    : null;
+    logFunction("Link:getAbsolutePath", `this.page: ${this.page}`, `this.address: ${this.address}`);
     if (!this.isRelative) throw new Error("Link:getAbsolutePath() called on non-relative path");
     return path.resolve(path.dirname(this.page), this.address);
   }

package/src/output_errors.js

@@ -1,14 +1,13 @@
 //import { /*LinkError,*/ CurrentFileMissingAnchorError, LinkedFileMissingAnchorError, LinkedInternalPageMissingError, InternalLinkToHTMLError, UrlToLocalSiteError} from "./errors.js"
 
 import { sharedData } from "./shared_data.js";
-
+import { logFunction } from "./helpers.js";
 
 //Function that generates console and/or log output from an array of error objects.
-// - `results` is an array of error objects. These will have a `type` and a `page`. They may also have other values, depending on type of error - such as linkurl
+// - `results` is an array of error objects.
+//  These will have a `type` and a `page`. They may also have other values, depending on type of error - such as linkurl
 function outputErrors(results) {
-  sharedData.options.log.includes("functions")
-    ? console.log("Function: outputErrors()")
-    : null;
+  logFunction("Function: outputErrors()");
 
   //Sort results by page and type.
   // Perhaps next step is to create only get info for particular pages.

package/src/process_image_orphans.js

@@ -3,6 +3,7 @@ import fs from "fs";
 import path from "path";
 import { sharedData } from "./shared_data.js";
 import { OrphanedImageError } from "./errors.js";
+import { logFunction } from "./helpers.js";
 
 function isImage(file) {
   const imageExtensions = [".jpg", ".jpeg", ".png", ".svg", ".gif", ".webm"];
@@ -14,9 +15,7 @@ var otherFileTypes = []; // Just used for logging in function below.
 
 // Gets all image files in a directory.
 async function getAllImageFilesInDirectory(dir) {
-  sharedData.options.log.includes("functions")
-    ? console.log(`Function: getAllImageFilesInDirectory(${dir})`)
-    : null;
+  logFunction(`Function: getAllImageFilesInDirectory(${dir})`)
 
   // TODO put this all in a try catch and return a better error.
   // Or perhaps put around parent.
@@ -43,9 +42,8 @@ async function getAllImageFilesInDirectory(dir) {
 
 // Checks if any images in the options.directory
 async function checkImageOrphansGlobal(results) {
-  sharedData.options.log.includes("functions")
-    ? console.log("Function: checkImageOrphansGlobal")
-    : null;
+  logFunction(`Function: checkImageOrphansGlobal()`)
+  
   const errors = [];
   let allImagesFound = [];
 

package/src/process_internal_url_links.js

@@ -1,8 +1,10 @@
 import path from "path";
 import { UrlToLocalSiteError} from "./errors.js"
+import { logFunction } from "./helpers.js";
 
 // An array of errors given a results object that contains our array of objects containing urls that link to our current site.
 function processUrlsToLocalSource(results) {
+  logFunction(`Function: processUrlsToLocalSource()`);
   const errors = [];
   results.forEach((page, index, array) => {
     //console.log(`PAGE: ${page}`);

package/src/process_local_image_links.js

@@ -2,11 +2,12 @@ import path from "path";
 import fs from "fs";
 import { sharedData } from "./shared_data.js";
 import { LocalImageNotFoundError } from "./errors.js";
+import { logFunction } from "./helpers.js";
 
 // Checks if every image in every markdown page (results.page.relativeImageLinks) is present on the file system.
 // - results is the array of information coming out of markdown parsing.
 async function checkLocalImageLinks(results) {
-  sharedData.options.log.includes("functions") ? console.log(`Function: checkLocalImageLinks()`) : null;
+  logFunction(`Function: checkLocalImageLinks()`);
   const errors = [];
   const promises = [];
 
@@ -20,25 +21,13 @@ async function checkLocalImageLinks(results) {
       //console.log(`link.linkUrlt: ${link.url}`);
       //console.log(`dirname: ${path.dirname(page.page_file)}`);
 
-      const fullImagePath = path.join(
-        path.dirname(page.page_file),
-        link.url
-      );
+      const fullImagePath = path.join(path.dirname(page.page_file), link.url);
       //console.log(`fullImagePath: ${fullImagePath}`);
       const promise = new Promise((resolve) => {
         fs.access(fullImagePath, fs.constants.F_OK, (err) => {
           if (err) {
             //console.log("Error");
-			      const error = new LocalImageNotFoundError({link: link});
-            /*
-            const error = {
-              type: "LocalImageNotFound",
-              page: `${page.page_file}`,
-              linkUrl: `${link.url}`,
-              linkText: `${link.text}`,
-              linkFullPath: `${fullImagePath}`,
-            };
-            */
+            const error = new LocalImageNotFoundError({ link: link });
             errors.push(error);
             resolve(false);
           } else {

package/src/process_markdown.js

@@ -1,12 +1,12 @@
 import { Link } from "./links.js";
 import { sharedData } from "./shared_data.js";
+import { logFunction } from "./helpers.js";
 
 // Returns slug for a string (markdown heading) using Vuepress algorithm.
 // Algorithm from chatgpt - needs testing.
 const processMarkdown = (contents, page) => {
-  sharedData.options.log.includes("functions")
-    ? console.log(`Function: processMarkdown(): page: ${page}`)
-    : null;
+  logFunction(`Function: processMarkdown(): page: ${page}`);
+
   const headings = [];
   //const anchors = [];
   const htmlAnchors = []; //{};
@@ -103,10 +103,10 @@ const processLineMarkdownLinks = (
   unHandledLinkTypes,
   page
 ) => {
-  sharedData.options.log.includes("functions")
-    ? console.log(`Function: processLineMarkdownLinks(): page: ${page}`)
-    : null;
+  logFunction(`Function: processMarkdown(): page: ${page}`);
+
   //const regex = /(?<prefix>[!@]?)\[(?<text>[^\]]+)\]\((?<url>\S+?)(?:\s+"(?<title>[^"]+)")?\)/g;
+  // Match to Markdown link OR image
   const regex =
     /(?<prefix>[!@]?)\[(?<text>[^\]]*)\]\((?<url>\S+?)(?:\s+"(?<title>[^"]+)")?\)/g;
   const matches = line.matchAll(regex);
@@ -310,12 +310,16 @@ const processLineMarkdownLinks = (
   //Might further parse this to catch img in anchor.
 
   //Match for html img - append to the lists
-  const regexHTMLImgTotal = /<img\s+(?<attributes>.*?)\/>/gi;
+  const regexHTMLImgTotal = /<img\s+(?<attributes>.*?)>/gi;
+  //const regexHTMLImgTotal = /<img\s+(?<attributes>.*?)\/>/gi;
+
   const regex_htmlattr_src =
     /src\s*[=]\s*(?<quote>['"])(?<src>.*?)(?<!\\)\k<quote>/i;
+
+
   for (const match of line.matchAll(regexHTMLImgTotal)) {
+    //console.log(`XXXXXregexHTMLImgTotals: ${match}`)
     const attributes = match.groups.attributes;
-    //console.log(`XXXXXImageattributes_s: ${attributes}`)
     const linkText = "";
     let linkTitle = "";
     let linkUrl = "";

package/src/process_orphans.js

@@ -2,14 +2,13 @@ import { logToFile } from "./helpers.js";
 import path from "path";
 import { sharedData } from "./shared_data.js";
 import { PageNotInTOCError, PageNotLinkedInternallyError } from "./errors.js";
-
+import { logFunction } from "./helpers.js";
 
 // Gets page with most links. Supposed to be used on the allResults object that is an array of objects about each page.
 // Will use to get the summary.
 function getPageWithMostLinks(pages) {
-  if (sharedData.options.log.includes("functions")) {
-    console.log("Function: getPageWithMostLinks");
-  }
+  logFunction(`Function: getPageWithMostLinks`);
+
   return pages.reduce(
     (maxLinksPage, currentPage) => {
       if (

package/src/process_relative_links.js

@@ -7,12 +7,11 @@ import {
   UrlToLocalSiteError,
 } from "./errors.js";
 import { sharedData } from "./shared_data.js";
+import { logFunction } from "./helpers.js";
 
 // An array of errors given a results object that contains our array of objects containing relativeLinks (and other information).
 function processRelativeLinks(results) {
-  sharedData.options.log.includes("functions")
-    ? console.log("Function: processRelativeLinks")
-    : null;
+  logFunction(`Function: processRelativeLinks()`);
   const errors = [];
 
   //console.log(sharedData);

package/tests/links/html/img/tests1.md

@@ -0,0 +1,12 @@
+# Test
+
+Run like: `node .\index.js -d tests/links/html/img/`
+
+Confirm links with and without end backslash are caught.
+Also with/without attributes
+
+<img src="../../assets/airframes/multicopter/x500_holybro_pixhawk4/img_with_no_end_backslash_oneofthree.png" width="400" title="Hanger gaskets">
+
+<img src="../../assets/airframes/multicopter/x500_holybro_pixhawk4/img_with_backslash_twoofthree.png" width="400" title="Hanger gaskets" />
+
+<img src="img_with_backslash_no_attributes_threeofthree.png" />