@softwear/latestcollectioncore 1.0.174 → 1.0.175

package/dist/imageBinder.js

@@ -66,19 +66,20 @@ function prepFilterSkusImages(filteredSkus, merge = true, fileNames) {
     const skusCopy = (0, deepCopy_1.default)(filteredSkus);
     const preppedSkus = [];
     const fileNames2skip = [];
-    let idx = 0;
-    skusCopy.forEach((sku) => {
-        const fieldsToBeMerged = {};
+    skusCopy.forEach((sku, idx) => {
         if (sku.images && sku.images.length > 0) {
             // If a fileName is already matched, we skip it
             fileNames.forEach((fileName) => {
                 var _a;
-                if (((_a = sku.images) === null || _a === void 0 ? void 0 : _a.includes(fileName)) && !fileNames2skip.includes(fileName))
+                if (((_a = sku.images) === null || _a === void 0 ? void 0 : _a.includes(fileName)) && fileNames2skip.indexOf(fileName) == -1)
                     fileNames2skip.push(fileName);
             });
             // If a sku has images, we skip it
+            sku['skip'] = true;
+            preppedSkus.push(sku);
             return;
         }
+        const fieldsToBeMerged = {};
         for (const fieldName in sku) {
             if (fieldName == '__created' || fieldName == '__modified' || fieldName == 'images' || fieldName == 'brandhash' || (merge == true && fieldName == 'colorFamily'))
                 continue;
@@ -107,7 +108,6 @@ function prepFilterSkusImages(filteredSkus, merge = true, fileNames) {
         else {
             const newSku = {};
             newSku['originalSku'] = filteredSkus[idx];
-            idx++;
             for (const fieldVal in fieldsToBeMerged) {
                 const fieldNameArray = fieldsToBeMerged[fieldVal].sort();
                 if (fieldNameArray.length > 1) {
@@ -121,7 +121,7 @@ function prepFilterSkusImages(filteredSkus, merge = true, fileNames) {
         }
     });
     const fileNames2Match = fileNames.filter((fileName) => {
-        return fileNames2skip.includes(fileName) == false;
+        return fileNames2skip.indexOf(fileName) == -1;
     });
     return { preppedSkus: preppedSkus, fileNames2Match: fileNames2Match };
 }
@@ -150,7 +150,7 @@ function checkWithoutLast(fileName) {
         .toLowerCase()
         .split(/[_\-.\s()]+|%[0-9A-Fa-f]{2}/)
         .slice(0, -1);
-    const lastToken = tokens.at(-1);
+    const lastToken = tokens[tokens.length - 1];
     let returnWithoutLast = false;
     if (lastToken) {
         if (lastToken.includes('front') || lastToken.includes('back') || lastToken.includes('side') || lastToken.includes('sole'))
@@ -201,7 +201,7 @@ function testQuickSearch(cleanedFileName, fileName, fileNameWithoutLast, quickSe
                         indicesToReturn.push(idx);
                         patternStringFound = quickSearchPattern;
                     }
-                    else if (indicesToReturn.length == 0 && pair[0] == fileNameWithoutLast && !indicesWithoutLast.includes(idx)) {
+                    else if (indicesToReturn.length == 0 && pair[0] == fileNameWithoutLast && indicesWithoutLast.indexOf(idx) == -1) {
                         indicesWithoutLast.push(idx);
                         patternStringFound = quickSearchPattern;
                     }
@@ -224,6 +224,8 @@ function prepQuickSearch(preppedSkus) {
         patternStrings.push(pattern.join('-'));
     });
     preppedSkus.forEach((sku, idx) => {
+        if (sku['skip'])
+            return;
         GLOBAL_PATTERNS.forEach((pattern, patternIndex) => {
             const proposedFilename = pattern.reduce((out, field) => out + (field in sku ? sku[field] : ''), '');
             if (proposedFilename) {
@@ -240,12 +242,12 @@ function prepQuickSearch(preppedSkus) {
 }
 function addNewPatternToQuickSearch(preppedSkus, pattern, quickSearch) {
     const newQuickSearchArray = [];
-    let idx = 0;
-    preppedSkus.forEach((sku) => {
+    preppedSkus.forEach((sku, idx) => {
+        if (sku['skip'])
+            return;
         const proposedFilename = pattern.reduce((out, field) => out + (field in sku ? sku[field] : ''), '');
         if (proposedFilename)
             newQuickSearchArray.push([proposedFilename, idx]);
-        idx++;
     });
     quickSearch[pattern.join('-')] = newQuickSearchArray;
     return quickSearch;
@@ -258,6 +260,8 @@ function fallbackSearch(cleanedFileName, fileNameWithoutLast, preppedSkus) {
     let currentBestSubstringPatterns = {};
     let maxPatternlength = 0;
     preppedSkus.forEach((sku, idx) => {
+        if (sku['skip'])
+            return;
         if (pattern_found.length > 0) {
             // In case a new pattern has been found in one sku, test that on the remaining skus. If they don't match the pattern, skip them.
             const proposedFilename = pattern_found.reduce((out, field) => out + (field in sku ? sku[field] : ''), '');
@@ -359,7 +363,7 @@ function fallbackSearch(cleanedFileName, fileNameWithoutLast, preppedSkus) {
                 const sku = preppedSkus[idx];
                 pattern.forEach((fieldName) => {
                     const fieldVal = sku[fieldName];
-                    if (fieldVal && !uniqueFieldVals.includes(fieldVal))
+                    if (fieldVal && uniqueFieldVals.indexOf(fieldVal) == -1)
                         uniqueFieldVals.push(fieldVal);
                 });
             });
@@ -407,6 +411,8 @@ function imageBinder(fileNames, filteredSkus, brand, specifiedPattern, test = fa
             const fileNameWithoutLast = checkWithoutLast(fileName);
             fileNameIndexMatch[fileName] = [];
             preppedSkus.forEach((sku, idx) => {
+                if (sku['skip'])
+                    return;
                 let skuStillMatches = true;
                 specifiedPattern.every((fieldName) => {
                     if (!(fieldName in sku))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.174",
+  "version": "1.0.175",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/imageBinder.ts

@@ -32,18 +32,19 @@ function prepFilterSkusImages(filteredSkus: SkuI[], merge = true, fileNames: Arr
   const skusCopy = deepCopy(filteredSkus)
   const preppedSkus: Array<Record<string, any>> = []
   const fileNames2skip: Array<string> = []
-  let idx = 0
-  skusCopy.forEach((sku) => {
-    const fieldsToBeMerged = {}
+  skusCopy.forEach((sku, idx) => {
     if (sku.images && sku.images.length > 0) {
       // If a fileName is already matched, we skip it
       fileNames.forEach((fileName) => {
-        if (sku.images?.includes(fileName) && !fileNames2skip.includes(fileName)) fileNames2skip.push(fileName)
+        if (sku.images?.includes(fileName) && fileNames2skip.indexOf(fileName) == -1) fileNames2skip.push(fileName)
       })
       // If a sku has images, we skip it
+      sku['skip'] = true
+      preppedSkus.push(sku)
       return
     }
 
+    const fieldsToBeMerged = {}
     for (const fieldName in sku) {
       if (fieldName == '__created' || fieldName == '__modified' || fieldName == 'images' || fieldName == 'brandhash' || (merge == true && fieldName == 'colorFamily')) continue
       let fieldVal = sku[fieldName]
@@ -70,7 +71,6 @@ function prepFilterSkusImages(filteredSkus: SkuI[], merge = true, fileNames: Arr
     } else {
       const newSku = {}
       newSku['originalSku'] = filteredSkus[idx]
-      idx++
       for (const fieldVal in fieldsToBeMerged) {
         const fieldNameArray = fieldsToBeMerged[fieldVal].sort()
         if (fieldNameArray.length > 1) {
@@ -83,7 +83,7 @@ function prepFilterSkusImages(filteredSkus: SkuI[], merge = true, fileNames: Arr
     }
   })
   const fileNames2Match = fileNames.filter((fileName) => {
-    return fileNames2skip.includes(fileName) == false
+    return fileNames2skip.indexOf(fileName) == -1
   })
   return { preppedSkus: preppedSkus, fileNames2Match: fileNames2Match }
 }
@@ -116,7 +116,7 @@ function checkWithoutLast(fileName: string) {
     .toLowerCase()
     .split(/[_\-.\s()]+|%[0-9A-Fa-f]{2}/)
     .slice(0, -1)
-  const lastToken = tokens.at(-1)
+  const lastToken = tokens[tokens.length - 1]
   let returnWithoutLast = false
   if (lastToken) {
     if (lastToken.includes('front') || lastToken.includes('back') || lastToken.includes('side') || lastToken.includes('sole')) returnWithoutLast = true
@@ -167,7 +167,7 @@ function testQuickSearch(
           if (pair[0] == cleanedFileName) {
             indicesToReturn.push(idx)
             patternStringFound = quickSearchPattern
-          } else if (indicesToReturn.length == 0 && pair[0] == fileNameWithoutLast && !indicesWithoutLast.includes(idx)) {
+          } else if (indicesToReturn.length == 0 && pair[0] == fileNameWithoutLast && indicesWithoutLast.indexOf(idx) == -1) {
             indicesWithoutLast.push(idx)
             patternStringFound = quickSearchPattern
           }
@@ -188,6 +188,7 @@ function prepQuickSearch(preppedSkus: any): Record<string, Array<any>> {
     patternStrings.push(pattern.join('-'))
   })
   preppedSkus.forEach((sku, idx) => {
+    if (sku['skip']) return
     GLOBAL_PATTERNS.forEach((pattern, patternIndex) => {
       const proposedFilename = pattern.reduce((out, field) => out + (field in sku ? sku[field] : ''), '')
       if (proposedFilename) {
@@ -204,11 +205,10 @@ function prepQuickSearch(preppedSkus: any): Record<string, Array<any>> {
 
 function addNewPatternToQuickSearch(preppedSkus: any, pattern: Array<string>, quickSearch: Record<string, Array<Array<any>>>): Record<string, Array<any>> {
   const newQuickSearchArray: Array<Array<any>> = []
-  let idx = 0
-  preppedSkus.forEach((sku) => {
+  preppedSkus.forEach((sku, idx) => {
+    if (sku['skip']) return
     const proposedFilename = pattern.reduce((out, field) => out + (field in sku ? sku[field] : ''), '')
     if (proposedFilename) newQuickSearchArray.push([proposedFilename, idx])
-    idx++
   })
   quickSearch[pattern.join('-')] = newQuickSearchArray
   return quickSearch
@@ -223,6 +223,7 @@ function fallbackSearch(cleanedFileName: string, fileNameWithoutLast: string, pr
   let currentBestSubstringPatterns: Record<string, Array<number>> = {}
   let maxPatternlength = 0
   preppedSkus.forEach((sku, idx) => {
+    if (sku['skip']) return
     if (pattern_found.length > 0) {
       // In case a new pattern has been found in one sku, test that on the remaining skus. If they don't match the pattern, skip them.
       const proposedFilename = pattern_found.reduce((out, field) => out + (field in sku ? sku[field] : ''), '')
@@ -282,15 +283,15 @@ function fallbackSearch(cleanedFileName: string, fileNameWithoutLast: string, pr
           substringPattern.splice(idx, 1)
         }
       })
-      const proposedFilename = Object.values(substringObject).join('')
+      const proposedFilename = (<any>Object).values(substringObject).join('')
       if (proposedFilename == cleanedFileName || (fileNameWithoutLast && proposedFilename == fileNameWithoutLast)) {
         // We've discovered a new pattern
-        pattern_found = Object.values(patternObject)
+        pattern_found = (<any>Object).values(patternObject)
         exactMatches.push(idx)
         return
       }
-      patternString = Object.values(patternObject).join('-')
-      const revisedPatternLength = Object.values(patternObject).length
+      patternString = (<any>Object).values(patternObject).join('-')
+      const revisedPatternLength = (<any>Object).values(patternObject).length
       if (revisedPatternLength == maxPatternlength) {
         // We've found a new pattern of the same length, so we keep this one too
         if (patternString in currentBestSubstringPatterns) {
@@ -317,7 +318,7 @@ function fallbackSearch(cleanedFileName: string, fileNameWithoutLast: string, pr
         const sku = preppedSkus[idx]
         pattern.forEach((fieldName) => {
           const fieldVal = sku[fieldName]
-          if (fieldVal && !uniqueFieldVals.includes(fieldVal)) uniqueFieldVals.push(fieldVal)
+          if (fieldVal && uniqueFieldVals.indexOf(fieldVal) == -1) uniqueFieldVals.push(fieldVal)
         })
       })
       uniqueFieldVals.sort((a, b) => {
@@ -364,6 +365,7 @@ function imageBinder(fileNames: Array<string>, filteredSkus: SkuI[], brand: stri
       const fileNameWithoutLast = checkWithoutLast(fileName)
       fileNameIndexMatch[fileName] = []
       preppedSkus.forEach((sku, idx) => {
+        if (sku['skip']) return
         let skuStillMatches = true
         specifiedPattern.every((fieldName) => {
           if (!(fieldName in sku)) skuStillMatches = false

package/test/imageBinder.spec.js

@@ -7,7 +7,7 @@ describe('imageBinder function', function () {
     // Tests on 1061 images, 1058 of which are fallback searches that return no results
     const result = await testBatch('miraclesuit')
     expect(Object.keys(result).length).toBe(8)
-    expect(result.Mismatches).toBe(1058)
+    expect(result.Mismatches).toBe(1052)
     expect(result.QuickSearch).toBe(3)
     expect(result.Patterns['articleCode|articleCodeSupplier-articleDescription-colorCodeSupplier|colorSupplier']).toBe(3)
     // Time can vary, so we use a loose check (within 5 seconds)
@@ -19,8 +19,8 @@ describe('imageBinder function', function () {
     const result = await testBatch('lowa')
     expect(Object.keys(result).length).toBe(8)
     expect(result.Mismatches).toBe(0)
-    expect(result.QuickSearch).toBe(1593)
-    expect(result.Patterns['articleCode|articleCodeSupplier-colorCodeSupplier|colorSupplier']).toBe(1592)
+    expect(result.QuickSearch).toBe(1587)
+    expect(result.Patterns['articleCode|articleCodeSupplier-colorCodeSupplier|colorSupplier']).toBe(1586)
     // Time can vary, so we use a loose check (within 5 seconds)
     expect(result.Time).toBeGreaterThan(0)
     expect(result.Time).toBeLessThan(5)
@@ -30,9 +30,9 @@ describe('imageBinder function', function () {
     const result = await testBatch('vacanzeitaliane')
     expect(Object.keys(result).length).toBe(8)
     expect(result.Brand).toBe('vacanzeitaliane')
-    expect(result.Mismatches).toBe(210)
-    expect(result.QuickSearch).toBe(506)
-    expect(result.Patterns['articleCode|articleCodeSupplier']).toBe(516)
+    expect(result.Mismatches).toBe(214)
+    expect(result.QuickSearch).toBe(496)
+    expect(result.Patterns['articleCode|articleCodeSupplier']).toBe(506)
     // Time can vary, so we use a loose check (within 5 seconds)
     expect(result.Time).toBeGreaterThan(0)
     expect(result.Time).toBeLessThan(5)
@@ -42,8 +42,8 @@ describe('imageBinder function', function () {
     expect(Object.keys(result).length).toBe(8)
     expect(result.Brand).toBe('dreamstar')
     expect(result.Mismatches).toBe(0)
-    expect(result.QuickSearch).toBe(792)
-    expect(result.Patterns['articleCode|articleCodeSupplier-colorCodeSupplier|colorSupplier']).toBe(634)
+    expect(result.QuickSearch).toBe(786)
+    expect(result.Patterns['articleCode|articleCodeSupplier-colorCodeSupplier|colorSupplier']).toBe(631)
     // Time can vary, so we use a loose check (within 5 seconds)
     expect(result.Time).toBeGreaterThan(0)
     expect(result.Time).toBeLessThan(5)