@softwear/latestcollectioncore 1.0.32 → 1.0.34

package/dist/buildPropertyMappingFn.d.ts

@@ -1,2 +1,2 @@
-import { SkuI } from "./index";
-export default function (brands: Array<any>): (sku: SkuI) => SkuI;
+import { SkuI, BrandSettingI } from "./index";
+export default function (brands: Array<BrandSettingI>): (sku: SkuI) => SkuI;

package/dist/buildPropertyMappingFn.js

@@ -27,22 +27,12 @@ function default_1(brands) {
     const indexedPropertyMapping = brands.reduce((acc, item) => {
         if (!acc[item.id])
             acc[item.id] = {};
-        // acc[item.id] = { ...acc[item.id], ...indexFn(item.propertyMapping) };
-        Object.entries(indexFn(item.propertyMapping)).forEach((m) => {
-            const category = m[0];
-            const mappings = m[1];
-            if (!acc[item.id])
-                acc[item.id] = {};
-            if (!acc[item.id][category])
-                acc[item.id][category] = {};
-            acc[item.id][category] = Object.assign(Object.assign({}, acc[item.id][category]), mappings);
-        });
+        Object.assign(acc[item.id], indexFn(item.propertyMapping));
         return acc;
     }, {});
     return function (sku) {
         const brand = (0, index_1.hashBrand)(sku.brand);
         const mapping = indexedPropertyMapping[brand];
-        // console.log("!!!!", sku.brand, mapping);
         if (!mapping)
             return sku;
         if (mapping.ColorCode) {

package/dist/getPreferedPropertyMappings.js

@@ -9,9 +9,7 @@ function default_1(activeConfig, metaBrandSetting, dataProviderBrandSetting, ten
         allMappings = metaBrandSetting;
     if ((_d = (_c = activeConfig === null || activeConfig === void 0 ? void 0 : activeConfig.products) === null || _c === void 0 ? void 0 : _c.applyDataProviderMapping) === null || _d === void 0 ? void 0 : _d.value)
         activeConfig.products.applyDataProviderMapping.value.forEach((provider) => {
-            allMappings = allMappings.concat(dataProviderBrandSetting
-                .filter((s) => s.dataProvider == provider)
-                .map((s) => (Object.assign(Object.assign({}, s), { id: s.id.split(":")[0] }))));
+            allMappings = allMappings.concat(dataProviderBrandSetting.filter((s) => s.dataProvider == provider).map((s) => (Object.assign(Object.assign({}, s), { id: s.id.split(":")[0] }))));
         });
     if ((_f = (_e = activeConfig === null || activeConfig === void 0 ? void 0 : activeConfig.products) === null || _e === void 0 ? void 0 : _e.applyTenantMapping) === null || _f === void 0 ? void 0 : _f.value)
         allMappings = allMappings.concat(tenantBrandSetting);

package/dist/hashBrand.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function default_1(brand = "") {
     if (typeof brand != "string")
         return "";
-    const charactersToRemove = "~<>!@#$%^&*():'\"? ";
+    const charactersToRemove = "~.<>!@#$%^&*():'\"? ";
     const l = brand.length;
     let result = "";
     for (let i = 0; i < l; i++) {

package/dist/types.d.ts

@@ -73,60 +73,59 @@ interface StockTransferSelectionI {
 interface SkuI {
     barcode?: barcode;
     id?: barcode;
-    primary?: boolean;
+    primary: boolean;
     articleCode: string;
-    articleDescription?: string;
-    pricetagLayouts?: string;
+    articleDescription: string;
+    pricetagLayouts: string;
     brand: string;
     articleGroup: string;
     articleGroupSupplier?: string;
     campaigns?: string;
     images?: string;
-    groups?: Array<GroupI>;
-    vat?: number;
-    vatCategory?: vatCategoryE;
+    groups: Array<GroupI>;
+    vat: number;
+    vatCategory: vatCategoryE;
     supplierName?: string;
-    size?: string;
+    size: string;
     sizeSupplier?: string;
     mainSize?: string;
     subSize?: string;
     subSizeSupplier?: string;
-    sizeIndex?: number;
+    sizeIndex: number;
     sizes?: Array<string>;
     sizeRange?: string;
     colorCode?: string;
     colorDescription?: string;
     colorSupplier?: string;
     colorCodeSupplier?: string;
-    colorFamily?: string;
-    mainColorCode?: string;
+    colorFamily: string;
+    mainColorCode: string;
     mainColorDescription?: string;
     subColorCode?: string;
     subColorDescription?: string;
     articleCodeSupplier?: string;
-    price?: number;
-    buyPrice?: number;
-    suggestedRetailPrice?: number;
-    valuePrice?: number;
-    salePrice?: number;
+    price: number;
+    buyPrice: number;
+    suggestedRetailPrice: number;
+    valuePrice: number;
+    salePrice: number;
     prices?: unknown;
     year?: string;
     season?: string;
-    collection?: string;
+    collection: string;
     collectionSupplier?: string;
-    active?: boolean;
-    skuActive?: boolean;
-    warehouseLocation?: string;
+    active: boolean;
+    skuActive: boolean;
+    warehouseLocation: string;
     tagType?: tagTypeE;
     directDelivery?: boolean;
     care?: CareI;
-    BRANDHASH?: string;
+    BRANDHASH: string;
     ATTRIBUTES?: object;
     IMAGES?: Array<ImageI>;
     SIZES?: unknown;
     FOOTPRINT?: number;
     quickPick?: number;
-    erpSource?: string;
 }
 interface MarkedSkuI extends SkuI {
     source?: string;

package/package.json

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

package/src/buildPropertyMappingFn.ts

@@ -1,105 +1,97 @@
-import { hashBrand, SkuI, MAPPING_CATEGORIES } from "./index"
+import { hashBrand, SkuI, MAPPING_CATEGORIES, BrandSettingI } from "./index";
 
-export default function (brands: Array<any>): (sku: SkuI) => SkuI {
+export default function (brands: Array<BrandSettingI>): (sku: SkuI) => SkuI {
   // Helper function to convert all mapping rules for given category to an indexed object
   const indexedMapping = function (propertyMapping, category) {
     const filteredMappings = propertyMapping.filter(
       (mapping) => mapping.category == category && mapping.from != undefined
-    )
+    );
 
-    if (filteredMappings.length == 0) return undefined
+    if (filteredMappings.length == 0) return undefined;
     return filteredMappings.reduce((acc, item) => {
-      acc[item.from] = item.to
-      return acc
-    }, {})
-  }
+      acc[item.from] = item.to;
+      return acc;
+    }, {});
+  };
   // Helper function to convert all mapping rules to an indexed object
-  const indexFn = function (propertyMapping): object {
-    if (!propertyMapping) return {}
-    const maps = {}
+  const indexFn = function (propertyMapping) {
+    if (!propertyMapping) return {};
+    const maps = {};
     MAPPING_CATEGORIES.forEach((category) => {
-      const map = indexedMapping(propertyMapping, category)
-      if (map !== undefined) maps[category] = map
-    })
-    return maps
-  }
+      const map = indexedMapping(propertyMapping, category);
+      if (map !== undefined) maps[category] = map;
+    });
+    return maps;
+  };
   const indexedPropertyMapping = brands.reduce((acc, item) => {
-    if (!acc[item.id]) acc[item.id] = {}
-    // acc[item.id] = { ...acc[item.id], ...indexFn(item.propertyMapping) };
-    Object.entries(indexFn(item.propertyMapping)).forEach((m) => {
-      const category = m[0]
-      const mappings = m[1]
-      if (!acc[item.id]) acc[item.id] = {}
-      if (!acc[item.id][category]) acc[item.id][category] = {}
-      acc[item.id][category] = { ...acc[item.id][category], ...mappings }
-    })
-    return acc
-  }, {})
+    if (!acc[item.id]) acc[item.id] = {};
+    Object.assign(acc[item.id], indexFn(item.propertyMapping));
+    return acc;
+  }, {});
 
   return function (sku: SkuI): SkuI {
-    const brand = hashBrand(sku.brand)
-    const mapping = indexedPropertyMapping[brand]
-    // console.log("!!!!", sku.brand, mapping);
-    if (!mapping) return sku
+    const brand = hashBrand(sku.brand);
+    const mapping = indexedPropertyMapping[brand];
+    if (!mapping) return sku;
 
     if (mapping.ColorCode) {
-      const from = sku.colorCodeSupplier
+      const from = sku.colorCodeSupplier;
       if (from) {
-        const to = indexedPropertyMapping[brand].ColorCode[from]
-        if (to && to != sku.colorFamily) sku.colorFamily = to
+        const to = indexedPropertyMapping[brand].ColorCode[from];
+        if (to && to != sku.colorFamily) sku.colorFamily = to;
       }
     }
     if (mapping.ColorDescription) {
-      const from = sku.colorSupplier
+      const from = sku.colorSupplier;
       if (from) {
-        const to = indexedPropertyMapping[brand].ColorDescription[from]
-        if (to && to != sku.colorFamily) sku.colorFamily = to
+        const to = indexedPropertyMapping[brand].ColorDescription[from];
+        if (to && to != sku.colorFamily) sku.colorFamily = to;
       }
     }
     if (mapping.ProductGroup) {
-      const from = sku.articleGroupSupplier
+      const from = sku.articleGroupSupplier;
       if (from) {
-        const to = indexedPropertyMapping[brand].ProductGroup[from]
-        if (to && to != sku.articleGroup) sku.articleGroup = to
+        const to = indexedPropertyMapping[brand].ProductGroup[from];
+        if (to && to != sku.articleGroup) sku.articleGroup = to;
       }
     }
     if (mapping.Collection) {
-      const from = sku.collectionSupplier
+      const from = sku.collectionSupplier;
       if (from) {
-        const to = indexedPropertyMapping[brand].Collection[from]
-        if (to && to != sku.collection) sku.collection = to
+        const to = indexedPropertyMapping[brand].Collection[from];
+        if (to && to != sku.collection) sku.collection = to;
       }
     }
     if (mapping.Size) {
-      const from = sku.sizeSupplier
+      const from = sku.sizeSupplier;
       if (from) {
-        const to = indexedPropertyMapping[brand].Size[from]
+        const to = indexedPropertyMapping[brand].Size[from];
         if (to && to != sku.size) {
-          sku.size = to
-          sku.mainSize = to
+          sku.size = to;
+          sku.mainSize = to;
         }
       }
     }
     if (mapping.SubSize) {
-      const from = sku.sizeSupplier
+      const from = sku.sizeSupplier;
       if (from) {
-        const to = indexedPropertyMapping[brand].SubSize[from]
-        if (to && to != sku.subSize) sku.subSize = to
+        const to = indexedPropertyMapping[brand].SubSize[from];
+        if (to && to != sku.subSize) sku.subSize = to;
       }
     }
     if (mapping.CustomSize) {
-      const from = sku.sizeSupplier
+      const from = sku.sizeSupplier;
       if (from) {
-        const to = indexedPropertyMapping[brand].CustomSize[from]
-        if (to && to != sku["_customsize"]) sku["_customsize"] = to
+        const to = indexedPropertyMapping[brand].CustomSize[from];
+        if (to && to != sku["_customsize"]) sku["_customsize"] = to;
       }
     }
     if (mapping.Gender) {
       // There is nothing to map 'from'
       // We only implement the fallback, this mapping is only usefull for brands where gender is constant
-      const to = indexedPropertyMapping[brand].Gender[""]
-      if (to && to != sku["_gender"]) sku["_gender"] = to
+      const to = indexedPropertyMapping[brand].Gender[""];
+      if (to && to != sku["_gender"]) sku["_gender"] = to;
     }
-    return sku
-  }
+    return sku;
+  };
 }

package/src/getPreferedPropertyMappings.ts

@@ -1,24 +1,13 @@
 // This function combined the 3 levels of property mapping into one mapping object
 // Each level can be opted in/out in the tenantPreferences defined in the activeConfig parameter
-export default function (
-  activeConfig,
-  metaBrandSetting,
-  dataProviderBrandSetting,
-  tenantBrandSetting
-) {
+export default function (activeConfig, metaBrandSetting, dataProviderBrandSetting, tenantBrandSetting) {
   let allMappings = []
-  if (activeConfig?.products?.applyLatestCollectionMapping?.value)
-    allMappings = metaBrandSetting
+  if (activeConfig?.products?.applyLatestCollectionMapping?.value) allMappings = metaBrandSetting
   if (activeConfig?.products?.applyDataProviderMapping?.value)
     activeConfig.products.applyDataProviderMapping.value.forEach((provider) => {
-      allMappings = allMappings.concat(
-        dataProviderBrandSetting
-          .filter((s) => s.dataProvider == provider)
-          .map((s) => ({ ...s, id: s.id.split(":")[0] }))
-      )
+      allMappings = allMappings.concat(dataProviderBrandSetting.filter((s) => s.dataProvider == provider).map((s) => ({ ...s, id: s.id.split(":")[0] })))
     })
 
-  if (activeConfig?.products?.applyTenantMapping?.value)
-    allMappings = allMappings.concat(tenantBrandSetting)
+  if (activeConfig?.products?.applyTenantMapping?.value) allMappings = allMappings.concat(tenantBrandSetting)
   return allMappings
 }

package/src/hashBrand.ts

@@ -1,6 +1,6 @@
 export default function (brand = ""): string {
   if (typeof brand != "string") return ""
-  const charactersToRemove = "~<>!@#$%^&*():'\"? "
+  const charactersToRemove = "~.<>!@#$%^&*():'\"? "
   const l = brand.length
   let result = ""
   for (let i = 0; i < l; i++) {

package/src/types.ts

@@ -81,60 +81,59 @@ interface StockTransferSelectionI {
 interface SkuI {
   barcode?: barcode
   id?: barcode
-  primary?: boolean
+  primary: boolean
   articleCode: string
-  articleDescription?: string
-  pricetagLayouts?: string
+  articleDescription: string
+  pricetagLayouts: string
   brand: string
   articleGroup: string
   articleGroupSupplier?: string
   campaigns?: string
   images?: string
-  groups?: Array<GroupI>
-  vat?: number
-  vatCategory?: vatCategoryE
+  groups: Array<GroupI>
+  vat: number
+  vatCategory: vatCategoryE
   supplierName?: string
-  size?: string
+  size: string
   sizeSupplier?: string
   mainSize?: string
   subSize?: string
   subSizeSupplier?: string
-  sizeIndex?: number
+  sizeIndex: number
   sizes?: Array<string>
   sizeRange?: string
   colorCode?: string
   colorDescription?: string
   colorSupplier?: string
   colorCodeSupplier?: string
-  colorFamily?: string
-  mainColorCode?: string
+  colorFamily: string
+  mainColorCode: string
   mainColorDescription?: string
   subColorCode?: string
   subColorDescription?: string
   articleCodeSupplier?: string
-  price?: number
-  buyPrice?: number
-  suggestedRetailPrice?: number
-  valuePrice?: number
-  salePrice?: number
+  price: number
+  buyPrice: number
+  suggestedRetailPrice: number
+  valuePrice: number
+  salePrice: number
   prices?: unknown
   year?: string
   season?: string
-  collection?: string
+  collection: string
   collectionSupplier?: string
-  active?: boolean
-  skuActive?: boolean
-  warehouseLocation?: string
+  active: boolean
+  skuActive: boolean
+  warehouseLocation: string
   tagType?: tagTypeE
   directDelivery?: boolean
   care?: CareI
-  BRANDHASH?: string
+  BRANDHASH: string
   ATTRIBUTES?: object
   IMAGES?: Array<ImageI>
   SIZES?: unknown
   FOOTPRINT?: number
   quickPick?: number
-  erpSource?: string
 }
 
 interface MarkedSkuI extends SkuI {

package/test/applyPreferedPropertyMappings.spec.js

@@ -107,6 +107,7 @@ const dataProviderMapping = [
     dataProvider: "linolux",
     propertyMapping: [
       { category: "ColorCode", from: "200", to: "Blauwer" },
+      { category: "ColorCode", from: "100", to: "Witter" },
       { category: "Collection", from: "SUMMER 2022", to: "22zomer" },
     ],
   },
@@ -115,10 +116,7 @@ const dataProviderMapping = [
 const tenantMapping = [
   {
     id: "levis",
-    propertyMapping: [
-      { category: "ColorCode", from: "200", to: "Blauwst" },
-      { category: "Collection", from: "SUMMER 2022", to: "22zomer" },
-    ],
+    propertyMapping: [{ category: "Collection", from: "SUMMER 2022", to: "22zomer" }],
   },
   {
     id: "gstar",
@@ -207,9 +205,9 @@ describe("applyPreferedPropertyMappings", () => {
 
   it("returns skus with LatestCollection and dataProvider mapping applied", function () {
     const mappedSkus = applyPreferedPropertyMappings(deepCopy(skus), twoMappingsActive, metaDataMapping, dataProviderMapping, tenantMapping)
-    expect(mappedSkus[0].colorFamily).to.equal("Wit")
-    expect(mappedSkus[1].colorFamily).to.equal("Wit")
-    expect(mappedSkus[2].colorFamily).to.equal("Wit")
+    expect(mappedSkus[0].colorFamily).to.equal("Witter")
+    expect(mappedSkus[1].colorFamily).to.equal("Witter")
+    expect(mappedSkus[2].colorFamily).to.equal("Witter")
     expect(mappedSkus[3].colorFamily).to.equal("Blauwer")
     expect(mappedSkus[4].colorFamily).to.equal("Blauwer")
     expect(mappedSkus[5].colorFamily).to.equal("Blauwer")
@@ -230,12 +228,12 @@ describe("applyPreferedPropertyMappings", () => {
 
   it("returns fully mapped skus on a full mapping", function () {
     const mappedSkus = applyPreferedPropertyMappings(deepCopy(skus), allMappingsActive, metaDataMapping, dataProviderMapping, tenantMapping)
-    expect(mappedSkus[0].colorFamily).to.equal("Wit")
-    expect(mappedSkus[1].colorFamily).to.equal("Wit")
-    expect(mappedSkus[2].colorFamily).to.equal("Wit")
-    expect(mappedSkus[3].colorFamily).to.equal("Blauwst")
-    expect(mappedSkus[4].colorFamily).to.equal("Blauwst")
-    expect(mappedSkus[5].colorFamily).to.equal("Blauwst")
+    expect(mappedSkus[0].colorFamily).to.equal("Witter")
+    expect(mappedSkus[1].colorFamily).to.equal("Witter")
+    expect(mappedSkus[2].colorFamily).to.equal("Witter")
+    expect(mappedSkus[3].colorFamily).to.equal("Blauwer")
+    expect(mappedSkus[4].colorFamily).to.equal("Blauwer")
+    expect(mappedSkus[5].colorFamily).to.equal("Blauwer")
     expect(mappedSkus[6].colorFamily).to.equal("Blue")
     expect(mappedSkus[7].colorFamily).to.equal("Blue")
     expect(mappedSkus[8].colorFamily).to.equal("Blue")

package/test/hashBrand.spec.js

@@ -12,6 +12,6 @@ describe("hashBrand function", function () {
     expect(hashBrand("Marie Jo")).to.equal("mariejo")
   })
   it("should return the input stripped from non characters", function () {
-    expect(hashBrand("Cl ~<>!@#$%^&*():'\"? ean")).to.equal("clean")
+    expect(hashBrand("Cl ~<>!@#$%.^&*():'\"? ean")).to.equal("clean")
   })
 })

package/.prettierrc

@@ -1,4 +0,0 @@
-{
-  "semi": false,
-  "printWidth": 180
-}