@factorypure/client-helpers 1.0.25 → 1.0.27

package/dist/index.d.ts

@@ -172,6 +172,10 @@ export declare const scrapeResultsSchema: z.ZodObject<{
     calculated_sku_count: z.ZodOptional<z.ZodNull>;
     raw_sku_results: z.ZodOptional<z.ZodNull>;
     details_and_offers: z.ZodOptional<z.ZodNull>;
+    total: z.ZodOptional<z.ZodNull>;
+    extracted_total: z.ZodOptional<z.ZodNull>;
+    shipping: z.ZodOptional<z.ZodNull>;
+    extracted_shipping: z.ZodOptional<z.ZodNull>;
     parsed_results: z.ZodOptional<z.ZodNull>;
     lowest_price: z.ZodOptional<z.ZodNull>;
     highest_price: z.ZodOptional<z.ZodNull>;
@@ -188,6 +192,7 @@ export declare const immersiveScrapeResultsSchema: z.ZodObject<{
     position: z.ZodNumber;
     title: z.ZodString;
     found_product_id: z.ZodString;
+    type: z.ZodString;
     product_link: z.ZodString;
     immersive_product_page_token: z.ZodString;
     source: z.ZodString;
@@ -198,14 +203,14 @@ export declare const immersiveScrapeResultsSchema: z.ZodObject<{
     extracted_old_price: z.ZodNullable<z.ZodAny>;
     total: z.ZodNullable<z.ZodAny>;
     extracted_total: z.ZodNullable<z.ZodAny>;
+    shipping: z.ZodNullable<z.ZodAny>;
+    extracted_shipping: z.ZodNullable<z.ZodAny>;
     rating: z.ZodNullable<z.ZodAny>;
     reviews: z.ZodNullable<z.ZodAny>;
     details_and_offers: z.ZodNullable<z.ZodArray<z.ZodString>>;
     tag: z.ZodNullable<z.ZodAny>;
     discount: z.ZodNullable<z.ZodAny>;
     extensions: z.ZodNullable<z.ZodAny>;
-    delivery: z.ZodNullable<z.ZodAny>;
-    delivery_extracted: z.ZodNullable<z.ZodAny>;
     created_at: z.ZodString;
     store_id: z.ZodNumber;
     serpapi_thumbnail: z.ZodString;

package/dist/index.js

@@ -64,6 +64,10 @@ export const scrapeResultsSchema = z.object({
     calculated_sku_count: z.null().optional(),
     raw_sku_results: z.null().optional(),
     details_and_offers: z.null().optional(),
+    total: z.null().optional(),
+    extracted_total: z.null().optional(),
+    shipping: z.null().optional(),
+    extracted_shipping: z.null().optional(),
     parsed_results: z.null().optional(),
     lowest_price: z.null().optional(),
     highest_price: z.null().optional(),
@@ -80,6 +84,7 @@ export const immersiveScrapeResultsSchema = z.object({
     position: z.number(),
     title: z.string(),
     found_product_id: z.string(),
+    type: z.string(),
     product_link: z.string(),
     immersive_product_page_token: z.string(),
     source: z.string(),
@@ -90,14 +95,14 @@ export const immersiveScrapeResultsSchema = z.object({
     extracted_old_price: z.nullable(z.any()),
     total: z.nullable(z.any()),
     extracted_total: z.nullable(z.any()),
+    shipping: z.nullable(z.any()),
+    extracted_shipping: z.nullable(z.any()),
     rating: z.nullable(z.any()),
     reviews: z.nullable(z.any()),
     details_and_offers: z.array(z.string()).nullable(),
     tag: z.nullable(z.any()),
     discount: z.nullable(z.any()),
     extensions: z.nullable(z.any()),
-    delivery: z.nullable(z.any()),
-    delivery_extracted: z.nullable(z.any()),
     created_at: z.string(),
     store_id: z.number(),
     serpapi_thumbnail: z.string(),
@@ -198,78 +203,30 @@ export const filterScrapeResults = ({ scrapeResults, variant, filters, globalScr
     return filteredResults;
 };
 const handleVendorExclusions = (dataToSearch, filters, variant) => {
-    if (!filters.skip_vendors || filters.skip_vendors.length === 0) {
-        return dataToSearch;
-    }
-    const { title, sku } = variant;
-    function customEncoder(content) {
-        const tokens = [];
-        const str = content.toLowerCase();
-        // Remove symbols from the string (keep only letters, numbers, commas, and spaces)
-        const cleanedStr = str.replace(/[\/-]/g, ' ');
-        const cleanedStr2 = cleanedStr.replace(/[^a-z0-9,\/\s]/gi, '');
-        const words = cleanedStr2.split(/\s+/);
-        for (let word of words) {
-            tokens.push(word);
-        }
-        return tokens;
-    }
-    const index = new Index({
-        // @ts-ignore
-        charset: EnglishPreset,
-        // encoder: encoder,
-        encode: customEncoder,
-        tokenize: 'strict',
-    });
-    dataToSearch.forEach((item, id) => {
-        index.add(id, item.title);
-    });
-    const searchTerms = filters.match_values;
-    let final = null;
-    searchTerms.forEach((term) => {
-        if (final === null) {
-            final = index.search(term, {
-                resolve: false,
-                suggest: true,
-            });
-        }
-        else {
-            final = final.or({
-                index: index,
-                query: term,
-                resolve: false,
-                suggest: true,
-            });
-        }
-    });
-    final = final.and({
-        index: index,
-        query: sku,
-        resolve: false,
-        suggest: true,
-    });
+    // Build exclusion list
     const nots = [];
-    if (filters.skip_vendors.length > 0) {
-        const formatted = filters.skip_vendors
-            .filter((vendor) => vendor.toLowerCase() !== variant.vendor.toLowerCase())
-            .map((vendor) => ` ${vendor} `);
-        nots.push(...formatted);
-    }
-    nots.forEach((term) => {
-        final = final.not({
-            index: index,
-            query: term,
-            resolve: false,
+    const formatted = filters.skip_vendors
+        .filter((s) => s.toLowerCase() !== variant.vendor.toLowerCase())
+        .map((s) => `${s}`);
+    nots.push(...formatted);
+    // Find matching indices based on search criteria
+    const matchingIndices = [];
+    dataToSearch.forEach((item, index) => {
+        // NOT logic: Check if none of the exclusion terms match
+        const hasExclusion = nots.some((sku) => {
+            const escaped = sku.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+            const matchRegex = new RegExp(`(?: |\/|\&|\=|"|'|\`)${escaped}(?: |\/|\&|\=|"|'|\`)`, 'gi');
+            const matches = item.title.match(matchRegex);
+            return matches && matches.length > 0;
         });
+        if (!hasExclusion) {
+            matchingIndices.push(index);
+        }
     });
-    const result = final.resolve({ limit: 1000 });
-    const resultsArray = [];
-    result.forEach((i) => {
-        resultsArray.push(dataToSearch[i]);
-    });
+    // Mark items that don't match with hide reason
     for (let index = 0; index < dataToSearch.length; index++) {
         const element = dataToSearch[index];
-        if (!result.includes(index)) {
+        if (!matchingIndices.includes(index)) {
             if (!element.hide_reasons) {
                 element.hide_reasons = [];
             }
@@ -279,74 +236,30 @@ const handleVendorExclusions = (dataToSearch, filters, variant) => {
     return dataToSearch;
 };
 const handleSkipSkuSearch = (dataToSearch, filters, variant) => {
-    const { title, sku } = variant;
-    function customEncoder(content) {
-        const tokens = [];
-        const str = content.toLowerCase();
-        // Remove symbols from the string (keep only letters, numbers, commas, and spaces)
-        const cleanedStr = str.replace(/[\/-]/g, ' ');
-        const cleanedStr2 = cleanedStr.replace(/[^a-z0-9,\/\s]/gi, '');
-        const words = cleanedStr2.split(/\s+/);
-        for (let word of words) {
-            tokens.push(word);
-        }
-        return tokens;
-    }
-    const index = new Index({
-        // @ts-ignore
-        charset: EnglishPreset,
-        // encoder: encoder,
-        encode: customEncoder,
-        tokenize: 'strict',
-    });
-    dataToSearch.forEach((item, id) => {
-        index.add(id, item.title);
-    });
-    const searchTerms = filters.match_values;
-    let final = null;
-    searchTerms.forEach((term) => {
-        if (final === null) {
-            final = index.search(term, {
-                resolve: false,
-                suggest: true,
-            });
-        }
-        else {
-            final = final.or({
-                index: index,
-                query: term,
-                resolve: false,
-                suggest: true,
-            });
-        }
-    });
-    final = final.and({
-        index: index,
-        query: sku,
-        resolve: false,
-        suggest: true,
-    });
+    // Build exclusion list
     const nots = [];
-    const formatted = filters.skip_skus
-        .filter((sku) => sku.toLowerCase() !== variant.sku.toLowerCase())
-        .map((sku) => ` ${sku} `);
+    const formatted = filters.skip_skus.filter((s) => s.toLowerCase() !== variant.sku.toLowerCase()).map((s) => `${s}`);
     nots.push(...formatted);
-    nots.push(...filters.vendor_search_exclusions.filter((sku) => sku.toLowerCase() !== variant.sku.toLowerCase()));
-    nots.forEach((term) => {
-        final = final.not({
-            index: index,
-            query: term,
-            resolve: false,
+    nots.push(...filters.vendor_search_exclusions.filter((s) => s.toLowerCase() !== variant.sku.toLowerCase()));
+    // Find matching indices based on search criteria
+    const matchingIndices = [];
+    dataToSearch.forEach((item, index) => {
+        // NOT logic: Check if none of the exclusion terms match
+        const hasExclusion = nots.some((sku) => {
+            const escapedSku = sku.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+            // this regex will pick up values from url eg. /product/sku12345/ without picking up partial matches and double counting eg. 15000 being counted twice in 15000 and xp15000
+            const skuRegex = new RegExp(`(?: |\/|\&|\=|"|'|\`)${escapedSku}(?: |\/|\&|\=|"|'|\`)`, 'gi');
+            const skuMatches = item.title.match(skuRegex);
+            return skuMatches && skuMatches.length > 0;
         });
+        if (!hasExclusion) {
+            matchingIndices.push(index);
+        }
     });
-    const result = final.resolve({ limit: 1000 });
-    const resultsArray = [];
-    result.forEach((i) => {
-        resultsArray.push(dataToSearch[i]);
-    });
+    // Mark items that don't match with hide reason
     for (let index = 0; index < dataToSearch.length; index++) {
         const element = dataToSearch[index];
-        if (!result.includes(index)) {
+        if (!matchingIndices.includes(index)) {
             if (!element.hide_reasons) {
                 element.hide_reasons = [];
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@factorypure/client-helpers",
-    "version": "1.0.25",
+    "version": "1.0.27",
     "description": "",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",