@softwear/latestcollectioncore 1.0.49 → 1.0.50

package/dist/buildPropertyMappingFn.js

@@ -12,7 +12,7 @@ const mappingPairs = [
     { category: 'Collection', from: 'collectionSupplier', to: 'collection' },
     { category: 'CustomSize', from: 'sizeSupplier', to: '_customsize' },
     { category: 'Size', from: 'sizeSupplier', to: 'size' },
-    { category: 'Gender', from: 'NOFROMFIELD', to: '_gender' },
+    { category: 'Gender', from: 'articleGroupSupplier', to: '_gender' },
 ];
 function default_1(brands, strategy) {
     // Helper function to convert all mapping rules for given category to an indexed object
@@ -75,15 +75,13 @@ function default_1(brands, strategy) {
         const brand = sku.BRANDHASH || (0, index_1.hashBrand)(sku.brand);
         const mapping = indexedByBrandPropertyMapping[brand];
         mappingPairs.forEach((pair) => {
-            var _a, _b;
+            var _a, _b, _c, _d, _e;
             if (sku[pair.to])
                 return; // Do not replace sku-level-user-supplied values
-            const from = sku[pair.from] || ''; // || "" allows mapping 'from nothing'. Useful to assign constants like Gender for single-gender-brands
-            let activeMapping = mapping;
-            const redirectedMapping = (_a = activeMapping === null || activeMapping === void 0 ? void 0 : activeMapping[pair.category]) === null || _a === void 0 ? void 0 : _a['~~'];
-            if (redirectedMapping)
-                activeMapping = indexedByBrandPropertyMapping[redirectedMapping];
-            const to = (_b = activeMapping === null || activeMapping === void 0 ? void 0 : activeMapping[pair.category]) === null || _b === void 0 ? void 0 : _b[from];
+            const from = sku[pair.from];
+            const redirectedMappingSource = (_a = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _a === void 0 ? void 0 : _a['~~'];
+            const redirectedMapping = redirectedMappingSource ? indexedByBrandPropertyMapping[redirectedMappingSource] : {};
+            const to = ((_b = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _b === void 0 ? void 0 : _b[from]) || ((_c = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _c === void 0 ? void 0 : _c['']) || ((_d = redirectedMapping === null || redirectedMapping === void 0 ? void 0 : redirectedMapping[pair.category]) === null || _d === void 0 ? void 0 : _d[from]) || ((_e = redirectedMapping === null || redirectedMapping === void 0 ? void 0 : redirectedMapping[pair.category]) === null || _e === void 0 ? void 0 : _e['']);
             if (!from && !to)
                 return;
             sku[pair.to] = to ? to : from;

package/package.json

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

package/src/buildPropertyMappingFn.ts

@@ -11,7 +11,7 @@ const mappingPairs = [
   { category: 'Collection', from: 'collectionSupplier', to: 'collection' },
   { category: 'CustomSize', from: 'sizeSupplier', to: '_customsize' },
   { category: 'Size', from: 'sizeSupplier', to: 'size' },
-  { category: 'Gender', from: 'NOFROMFIELD', to: '_gender' },
+  { category: 'Gender', from: 'articleGroupSupplier', to: '_gender' },
 ]
 export default function (brands: Array<BrandSettingI>, strategy: mappingStrategyE): (sku: SkuI) => SkuI {
   // Helper function to convert all mapping rules for given category to an indexed object
@@ -68,12 +68,11 @@ export default function (brands: Array<BrandSettingI>, strategy: mappingStrategy
     const mapping = indexedByBrandPropertyMapping[brand]
     mappingPairs.forEach((pair) => {
       if (sku[pair.to]) return // Do not replace sku-level-user-supplied values
-      const from = sku[pair.from] || '' // || "" allows mapping 'from nothing'. Useful to assign constants like Gender for single-gender-brands
-      let activeMapping = mapping
-      const redirectedMapping = activeMapping?.[pair.category]?.['~~']
-      if (redirectedMapping) activeMapping = indexedByBrandPropertyMapping[redirectedMapping]
+      const from = sku[pair.from]
+      const redirectedMappingSource = mapping?.[pair.category]?.['~~']
+      const redirectedMapping = redirectedMappingSource ? indexedByBrandPropertyMapping[redirectedMappingSource] : {}
 
-      const to = activeMapping?.[pair.category]?.[from]
+      const to = mapping?.[pair.category]?.[from] || mapping?.[pair.category]?.[''] || redirectedMapping?.[pair.category]?.[from] || redirectedMapping?.[pair.category]?.['']
       if (!from && !to) return
       sku[pair.to] = to ? to : from
     })

package/test/applyPropertyMapping.spec.js

@@ -169,6 +169,15 @@ const fullMapping = [
   },
 ]
 
+const fallbackMapping = [
+  {
+    id: 'levis',
+    propertyMapping: [
+      { category: 'ColorCode', from: '200', to: 'Blauw-fallbackMapping' },
+      { category: 'ColorCode', from: '', to: 'fallbackMapping' },
+    ],
+  },
+]
 describe('applyPropertyMapping', () => {
   it('returns empty array on an empty array', function () {
     expect(applyPropertyMapping([], []).length).to.equal(0)
@@ -286,6 +295,19 @@ describe('applyPropertyMapping', () => {
     expect(mappedSkus[7]._gender).to.equal('uni')
   })
 
+  it('returns mapped skus on a default mapping rules', function () {
+    const mappedSkus = applyPropertyMapping(deepCopy(skus), fallbackMapping)
+    expect(mappedSkus[0].colorFamily).to.equal('fallbackMapping')
+    expect(mappedSkus[1].colorFamily).to.equal('fallbackMapping')
+    expect(mappedSkus[2].colorFamily).to.equal('fallbackMapping')
+    expect(mappedSkus[3].colorFamily).to.equal('Blauw-fallbackMapping')
+    expect(mappedSkus[4].colorFamily).to.equal('Blauw-fallbackMapping')
+    expect(mappedSkus[5].colorFamily).to.equal('Blauw-fallbackMapping')
+    expect(mappedSkus[6].colorFamily).to.equal('Blue')
+    expect(mappedSkus[7].colorFamily).to.equal('Blue')
+    expect(mappedSkus[8].colorFamily).to.equal('Blue')
+  })
+
   it('returns cleaned-up redunddant properies on a full mapping', function () {
     const cleanedSkus = applyPropertyCleaning(deepCopy(skus), fullMapping)
     expect(cleanedSkus[9].articleGroupSupplier).to.equal('ForTheCleanupTest')