ftmocks-utils 1.2.5 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ftmocks-utils",
-  "version": "1.2.5",
+  "version": "1.3.1",
   "description": "Util functions for FtMocks",
   "main": "src/index.js",
   "scripts": {

package/src/common-utils.js

@@ -1,21 +1,31 @@
 const path = require("path");
 const fs = require("fs");
+const { FtJSON } = require("./json-utils");
 
 const charDifference = (str1, str2) => {
-  let count1 = {},
-    count2 = {};
+  if (str1 && str2) {
+    let count1 = {};
+    let count2 = {};
 
-  for (let ch of str1) count1[ch] = (count1[ch] || 0) + 1;
-  for (let ch of str2) count2[ch] = (count2[ch] || 0) + 1;
+    for (let ch of str1) count1[ch] = (count1[ch] || 0) + 1;
+    for (let ch of str2) count2[ch] = (count2[ch] || 0) + 1;
 
-  let diff = 0;
-  let chars = new Set([...Object.keys(count1), ...Object.keys(count2)]);
+    let diff = 0;
+    let chars = new Set([...Object.keys(count1), ...Object.keys(count2)]);
 
-  for (let ch of chars) {
-    diff += Math.abs((count1[ch] || 0) - (count2[ch] || 0));
-  }
+    for (let ch of chars) {
+      diff += Math.abs((count1[ch] || 0) - (count2[ch] || 0));
+    }
 
-  return diff;
+    return diff;
+  } else {
+    if (!str1 && str2) {
+      return str2.length;
+    } else if (str1 && !str2) {
+      return str1.length;
+    }
+    return 0;
+  }
 };
 
 const nameToFolder = (name) => {
@@ -52,37 +62,6 @@ const capitalizeHeaders = (headers) => {
   );
 };
 
-const areJsonEqual = (jsonObj1, jsonObj2) => {
-  // Check if both are objects and not null
-  if (
-    typeof jsonObj1 === "object" &&
-    jsonObj1 !== null &&
-    typeof jsonObj2 === "object" &&
-    jsonObj2 !== null
-  ) {
-    // Get the keys of both objects
-    const keys1 = Object.keys(jsonObj1);
-    const keys2 = Object.keys(jsonObj2);
-
-    // Check if the number of keys is different
-    if (keys1.length !== keys2.length) {
-      return false;
-    }
-
-    // Recursively check each key-value pair
-    for (let key of keys1) {
-      if (!keys2.includes(key) || !areJsonEqual(jsonObj1[key], jsonObj2[key])) {
-        return false;
-      }
-    }
-
-    return true;
-  } else {
-    // For non-object types, use strict equality comparison
-    return jsonObj1 === jsonObj2;
-  }
-};
-
 const clearNulls = (postData) => {
   Object.keys(postData || {}).forEach((key) => {
     if (postData[key] === null) {
@@ -162,7 +141,6 @@ module.exports = {
   getFallbackDir,
   capitalizeHeader,
   capitalizeHeaders,
-  areJsonEqual,
   clearNulls,
   processURL,
   getHeaders,

package/src/index.js

@@ -6,16 +6,20 @@ const {
   nameToFolder,
   getMockDir,
   getFallbackDir,
-  areJsonEqual,
   clearNulls,
   processURL,
   getHeaders,
   countFilesInDirectory,
   getTestByName,
 } = require("./common-utils");
+const { FtJSON } = require("./json-utils");
 
 const getDefaultMockDataFromConfig = (testConfig) => {
-  const defaultPath = path.join(getMockDir(testConfig), "default.json");
+  const defaultPath = path.join(
+    getMockDir(testConfig),
+    "defaultMocks",
+    "_mock_list.json"
+  );
 
   try {
     const defaultData = fs.readFileSync(defaultPath, "utf8");
@@ -38,7 +42,7 @@ const getDefaultMockDataFromConfig = (testConfig) => {
     });
     return parsedData;
   } catch (error) {
-    console.error(`Error reading or parsing default.json:`, error);
+    console.error(`Error reading or parsing default mocks:`, error);
     return [];
   }
 };
@@ -99,11 +103,11 @@ const isSameRequest = (req1, req2) => {
     (!req1.postData && req2.postData) ||
     (req1.postData && !req2.postData)
   ) {
-    matched = areJsonEqual(req1.postData || {}, req2.postData || {});
+    matched = FtJSON.areJsonEqual(req1.postData || {}, req2.postData || {});
   } else if (
     req1.postData &&
     req2.postData &&
-    !areJsonEqual(req1.postData, req2.postData)
+    !FtJSON.areJsonEqual(req1.postData, req2.postData)
   ) {
     matched = false;
   }
@@ -127,8 +131,8 @@ const getSameRequestRank = (req1, req2) => {
     rank = rank + queryDiff;
     // Compare post data
     const charDiff = charDifference(
-      JSON.stringify(req1.postData || {}),
-      JSON.stringify(req2.postData || {})
+      FtJSON.stringify(req1.postData || {}),
+      FtJSON.stringify(req2.postData || {})
     );
     rank = rank + charDiff;
   }
@@ -142,7 +146,7 @@ function compareMockToRequest(mock, req) {
   );
   const reqURL = processURL(req.originalUrl, mock.fileContent.ignoreParams);
   const postData = mock.fileContent.request?.postData?.text
-    ? JSON.parse(mock.fileContent.request?.postData?.text)
+    ? FtJSON.parse(mock.fileContent.request?.postData?.text)
     : mock.fileContent.request?.postData;
   return isSameRequest(
     { url: mockURL, method: mock.fileContent.method, postData },
@@ -162,14 +166,14 @@ function compareMockToFetchRequest(mock, fetchReq) {
     );
     const reqURL = processURL(fetchReq.url, mock.fileContent.ignoreParams);
     const postData = mock.fileContent.request?.postData?.text
-      ? JSON.parse(mock.fileContent.request?.postData?.text)
+      ? FtJSON.parse(mock.fileContent.request?.postData?.text)
       : mock.fileContent.request?.postData;
     return isSameRequest(
       { url: mockURL, method: mock.fileContent.method, postData },
       {
         method: fetchReq.options.method || "GET",
         postData: fetchReq.options.body?.length
-          ? JSON.parse(fetchReq.options.body)
+          ? FtJSON.parse(fetchReq.options.body)
           : fetchReq.options.body,
         url: reqURL,
       }
@@ -189,14 +193,14 @@ function getCompareRankMockToFetchRequest(mock, fetchReq) {
     );
     const reqURL = processURL(fetchReq.url, mock.fileContent.ignoreParams);
     const postData = mock.fileContent.request?.postData?.text
-      ? JSON.parse(mock.fileContent.request?.postData?.text)
+      ? FtJSON.parse(mock.fileContent.request?.postData?.text)
       : mock.fileContent.request?.postData;
     return getSameRequestRank(
       { url: mockURL, method: mock.fileContent.method, postData },
       {
         method: fetchReq.options.method || "GET",
         postData: fetchReq.options.body?.length
-          ? JSON.parse(fetchReq.options.body)
+          ? FtJSON.parse(fetchReq.options.body)
           : fetchReq.options.body,
         url: reqURL,
       }
@@ -272,11 +276,18 @@ function getMatchingMockData({
   }
   // updating stats to mock file
   if (foundMock) {
-    const mockFilePath = path.join(
+    let mockFilePath = path.join(
       getMockDir(testConfig),
       `test_${nameToFolder(testName)}`,
       `mock_${foundMock.id}.json`
     );
+    if (!fs.existsSync(mockFilePath)) {
+      mockFilePath = path.join(
+        getMockDir(testConfig),
+        "defaultMocks",
+        `mock_${foundMock.id}.json`
+      );
+    }
     foundMock.fileContent.served = true;
     fs.writeFileSync(
       mockFilePath,
@@ -351,12 +362,20 @@ async function initiatePlaywrightRoutes(
         };
 
         if (file) {
-          const filePath = path.join(
+          let filePath = path.join(
             getMockDir(ftmocksConifg),
             `test_${nameToFolder(testName)}`,
             "_files",
             file
           );
+          if (!fs.existsSync(filePath)) {
+            filePath = path.join(
+              getMockDir(ftmocksConifg),
+              "defaultMocks",
+              "_files",
+              file
+            );
+          }
           if (fs.existsSync(filePath) && fs.lstatSync(filePath).isFile()) {
             const fileContent = fs.readFileSync(filePath);
             json.body = fileContent;
@@ -511,7 +530,7 @@ async function initiateJestFetch(jest, ftmocksConifg, testName) {
     return Promise.resolve({
       status,
       headers: new Map(Object.entries(headers)),
-      json: () => Promise.resolve(JSON.parse(content)),
+      json: () => Promise.resolve(FtJSON.parse(content)),
     });
   });
 
@@ -748,17 +767,17 @@ const isSameResponse = (req1, req2) => {
       (!req1.response.content && req2.response.content) ||
       (req1.response.content && !req2.response.content)
     ) {
-      matched = areJsonEqual(
-        JSON.parse(req1.response.content) || {},
-        JSON.parse(req2.response.content) || {}
+      matched = FtJSON.areJsonEqual(
+        FtJSON.parse(req1.response.content) || {},
+        FtJSON.parse(req2.response.content) || {}
       );
       // console.log('not matched at post Data 0', req1.postData, req2.postData);
     } else if (
       req1.response.content &&
       req2.response.content &&
-      !areJsonEqual(
-        JSON.parse(req1.response.content) || {},
-        JSON.parse(req2.response.content) || {}
+      !FtJSON.areJsonEqual(
+        FtJSON.parse(req1.response.content) || {},
+        FtJSON.parse(req2.response.content) || {}
       )
     ) {
       matched = false;

package/src/json-utils.js

@@ -0,0 +1,55 @@
+class FtJSON {
+  static parse(text, reviver, reference) {
+    try {
+      return JSON.parse(text, reviver);
+    } catch (error) {
+      console.error("FtJSON parse error:", error, reference);
+      return text;
+    }
+  }
+
+  static stringify(value, replacer, space, reference) {
+    try {
+      return JSON.stringify(value, replacer, space);
+    } catch (error) {
+      console.error("FtJSON stringify error:", error, reference);
+      return value;
+    }
+  }
+
+  static areJsonEqual(jsonObj1, jsonObj2) {
+    // Check if both are objects and not null
+    if (
+      typeof jsonObj1 === "object" &&
+      jsonObj1 !== null &&
+      typeof jsonObj2 === "object" &&
+      jsonObj2 !== null
+    ) {
+      // Get the keys of both objects
+      const keys1 = Object.keys(jsonObj1);
+      const keys2 = Object.keys(jsonObj2);
+
+      // Check if the number of keys is different
+      if (keys1.length !== keys2.length) {
+        return false;
+      }
+
+      // Recursively check each key-value pair
+      for (let key of keys1) {
+        if (
+          !keys2.includes(key) ||
+          !FtJSON.areJsonEqual(jsonObj1[key], jsonObj2[key])
+        ) {
+          return false;
+        }
+      }
+
+      return true;
+    } else {
+      // For non-object types, use strict equality comparison
+      return jsonObj1 === jsonObj2;
+    }
+  }
+}
+
+module.exports = { FtJSON };