@softwear/latestcollectioncore 1.0.64 → 1.0.66

package/dist/buildPropertyMappingFn.js

@@ -22,42 +22,23 @@ const evaluateFromExpr = function (sku, from) {
     return from.map((field) => sku[field] || '').join('.');
 };
 function default_1(brands, strategy) {
-    // 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;
-        return filteredMappings.reduce((acc, item) => {
-            acc[item.from] = item.to;
-            return acc;
-        }, {});
-    };
-    // Helper function to convert all mapping rules to an indexed object
-    const indexFn = function (propertyMapping) {
-        if (!propertyMapping)
-            return {};
-        const maps = {};
-        index_1.MAPPING_CATEGORIES.forEach((category) => {
-            const map = indexedMapping(propertyMapping, category);
-            if (map !== undefined)
-                maps[category] = map;
+    const indexedByBrandPropertyMapping = {};
+    brands.forEach(({ id, propertyMapping }) => {
+        if (!indexedByBrandPropertyMapping[id])
+            indexedByBrandPropertyMapping[id] = {};
+        propertyMapping?.forEach((mapping) => {
+            if (!indexedByBrandPropertyMapping[id][mapping.category])
+                indexedByBrandPropertyMapping[id][mapping.category] = {};
+            indexedByBrandPropertyMapping[id][mapping.category][mapping.from] = mapping.to;
         });
-        return maps;
-    };
-    const indexedByBrandPropertyMapping = brands.reduce((acc, item) => {
-        if (!acc[item.id])
-            acc[item.id] = {};
-        Object.assign(acc[item.id], indexFn(item.propertyMapping));
-        return acc;
-    }, {});
+    });
     if (strategy == 'clean')
         return function (sku) {
             const brand = sku.BRANDHASH || (0, index_1.hashBrand)(sku.brand);
             const mapping = indexedByBrandPropertyMapping[brand];
             mappingPairs.forEach((pair) => {
-                var _a;
                 const from = evaluateFromExpr(sku, pair.from) || '';
-                const to = (_a = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _a === void 0 ? void 0 : _a[from];
+                const to = mapping?.[pair.category]?.[from];
                 if (!from || !to)
                     return;
                 if (sku[pair.to] == to || from == sku[pair.to])
@@ -70,11 +51,10 @@ 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, _c, _d, _e;
                 const from = evaluateFromExpr(sku, pair.from) || '';
-                const redirectedMappingSource = ((_a = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _a === void 0 ? void 0 : _a['~~']) || pair.defaultMappingSource;
+                const redirectedMappingSource = mapping?.[pair.category]?.['~~'] || pair.defaultMappingSource;
                 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['']);
+                const to = mapping?.[pair.category]?.[from] || mapping?.[pair.category]?.[''] || redirectedMapping?.[pair.category]?.[from] || redirectedMapping?.[pair.category]?.[''];
                 if (to == undefined)
                     sku[pair.to] = '***';
             });
@@ -84,13 +64,12 @@ 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, _c, _d, _e;
             if (sku[pair.to])
                 return; // Do not replace sku-level-user-supplied values
             const from = evaluateFromExpr(sku, pair.from);
-            const redirectedMappingSource = ((_a = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _a === void 0 ? void 0 : _a['~~']) || pair.defaultMappingSource;
+            const redirectedMappingSource = mapping?.[pair.category]?.['~~'] || pair.defaultMappingSource;
             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['']);
+            const to = mapping?.[pair.category]?.[from] || mapping?.[pair.category]?.[''] || redirectedMapping?.[pair.category]?.[from] || redirectedMapping?.[pair.category]?.[''];
             if (!from && !to)
                 return;
             if (pair.mustMatch) {

package/dist/getPreferedPropertyMappings.js

@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // 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
 function default_1(activeConfig, metaBrandSetting, dataProviderBrandSetting, tenantBrandSetting) {
-    var _a, _b, _c, _d, _e, _f;
     let allMappings = [];
-    if ((_b = (_a = activeConfig === null || activeConfig === void 0 ? void 0 : activeConfig.products) === null || _a === void 0 ? void 0 : _a.applyLatestCollectionMapping) === null || _b === void 0 ? void 0 : _b.value)
+    if (activeConfig?.products?.applyLatestCollectionMapping?.value)
         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)
+    if (activeConfig?.products?.applyDataProviderMapping?.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) => ({ ...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)
+    if (activeConfig?.products?.applyTenantMapping?.value)
         allMappings = allMappings.concat(tenantBrandSetting);
     return allMappings;
 }

package/dist/index.d.ts

@@ -4,5 +4,6 @@ export { default as ean13 } from './ean13';
 export { default as getPreferedPropertyMappings } from './getPreferedPropertyMappings';
 export { default as hashBrand } from './hashBrand';
 export { default as hasOnlyDigits } from './hasOnlyDigits';
+export { default as sizeToMap } from './sizeToMap';
 export * from './types';
 export * from './consts';

package/dist/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasOnlyDigits = exports.hashBrand = exports.getPreferedPropertyMappings = exports.ean13 = exports.deepCopy = exports.buildPropertyMappingFn = void 0;
+exports.sizeToMap = exports.hasOnlyDigits = exports.hashBrand = exports.getPreferedPropertyMappings = exports.ean13 = exports.deepCopy = exports.buildPropertyMappingFn = void 0;
 var buildPropertyMappingFn_1 = require("./buildPropertyMappingFn");
 Object.defineProperty(exports, "buildPropertyMappingFn", { enumerable: true, get: function () { return __importDefault(buildPropertyMappingFn_1).default; } });
 var deepCopy_1 = require("./deepCopy");
@@ -30,5 +30,7 @@ var hashBrand_1 = require("./hashBrand");
 Object.defineProperty(exports, "hashBrand", { enumerable: true, get: function () { return __importDefault(hashBrand_1).default; } });
 var hasOnlyDigits_1 = require("./hasOnlyDigits");
 Object.defineProperty(exports, "hasOnlyDigits", { enumerable: true, get: function () { return __importDefault(hasOnlyDigits_1).default; } });
+var sizeToMap_1 = require("./sizeToMap");
+Object.defineProperty(exports, "sizeToMap", { enumerable: true, get: function () { return __importDefault(sizeToMap_1).default; } });
 __exportStar(require("./types"), exports);
 __exportStar(require("./consts"), exports);

package/dist/sizeToMap.d.ts

@@ -0,0 +1 @@
+export default function (size: String): String;

package/dist/sizeToMap.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function default_1(size) {
+    if (typeof size != 'string')
+        return '';
+    return size.replaceAll(' ', '').replaceAll(',', '.').toUpperCase();
+}
+exports.default = default_1;

package/dist/types.d.ts

@@ -191,6 +191,11 @@ interface ProductI {
     warehouseLocation: string;
     year?: string;
 }
+interface PropertyMappingI {
+    category: string;
+    from: string;
+    to: string;
+}
 interface BrandSettingI {
     id: string;
     name: string;
@@ -211,7 +216,7 @@ interface BrandSettingI {
     whiteListTenants?: string[];
     associates?: object[];
     authGroups?: string[];
-    propertyMapping?: object[];
+    propertyMapping?: PropertyMappingI[];
     fashionCloudId?: string;
 }
 declare enum mappingStrategyE {

package/package.json

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

package/src/buildPropertyMappingFn.ts

@@ -1,4 +1,4 @@
-import { hashBrand, SkuI, MAPPING_CATEGORIES, BrandSettingI, mappingStrategyE } from './index'
+import { hashBrand, SkuI, BrandSettingI, mappingStrategyE } from './index'
 
 // The order of the following mappingPairs is significant.
 // The ERM mapping relies on the Gender and ProductGroup mapping to have been evaluated first
@@ -20,33 +20,24 @@ const evaluateFromExpr = function (sku: SkuI, from: string | string[]): string {
   if (typeof from == 'string') return sku[from]
   return from.map((field) => sku[field] || '').join('.')
 }
-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
-  const indexedMapping = function (propertyMapping, category) {
-    const filteredMappings = propertyMapping.filter((mapping) => mapping.category == category && mapping.from != undefined)
 
-    if (filteredMappings.length == 0) return undefined
-    return filteredMappings.reduce((acc, item) => {
-      acc[item.from] = item.to
-      return acc
-    }, {})
-  }
-  // Helper function to convert all mapping rules to an indexed object
-  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
+interface propertyMappingI {
+  [brandId: string]: {
+    [category: string]: {
+      [from: string]: string
+    }
   }
-  const indexedByBrandPropertyMapping = brands.reduce((acc, item) => {
-    if (!acc[item.id]) acc[item.id] = {}
-    Object.assign(acc[item.id], indexFn(item.propertyMapping))
-    return acc
-  }, {})
+}
 
+export default function (brands: Array<BrandSettingI>, strategy: mappingStrategyE): (sku: SkuI) => SkuI {
+  const indexedByBrandPropertyMapping = {} as propertyMappingI
+  brands.forEach(({ id, propertyMapping }) => {
+    if (!indexedByBrandPropertyMapping[id]) indexedByBrandPropertyMapping[id] = {}
+    propertyMapping?.forEach((mapping) => {
+      if (!indexedByBrandPropertyMapping[id][mapping.category]) indexedByBrandPropertyMapping[id][mapping.category] = {}
+      indexedByBrandPropertyMapping[id][mapping.category][mapping.from] = mapping.to
+    })
+  })
   if (strategy == 'clean')
     return function (sku: SkuI): SkuI {
       const brand = sku.BRANDHASH || hashBrand(sku.brand)

package/src/index.ts

@@ -4,5 +4,6 @@ export { default as ean13 } from './ean13'
 export { default as getPreferedPropertyMappings } from './getPreferedPropertyMappings'
 export { default as hashBrand } from './hashBrand'
 export { default as hasOnlyDigits } from './hasOnlyDigits'
+export { default as sizeToMap } from './sizeToMap'
 export * from './types'
 export * from './consts'

package/src/sizeToMap.ts

@@ -0,0 +1,4 @@
+export default function (size: String): String {
+  if (typeof size != 'string') return ''
+  return size.replaceAll(' ', '').replaceAll(',', '.').toUpperCase()
+}

package/src/types.ts

@@ -204,6 +204,11 @@ interface ProductI {
   year?: string
 }
 
+interface PropertyMappingI {
+  category: string
+  from: string
+  to: string
+}
 interface BrandSettingI {
   id: string
   name: string
@@ -224,7 +229,7 @@ interface BrandSettingI {
   whiteListTenants?: string[]
   associates?: object[]
   authGroups?: string[]
-  propertyMapping?: object[]
+  propertyMapping?: PropertyMappingI[]
   fashionCloudId?: string
 }
 
@@ -233,6 +238,7 @@ enum mappingStrategyE {
   CLEAN = 'clean',
   MARK = 'markMissingMapping',
 }
+
 export {
   RowI,
   StockTransferSelectionI,

package/test/applyPropertyMapping.spec.js

@@ -107,6 +107,16 @@ const skus = [
     collection: '22zomer',
     _customsize: 'medium',
   },
+  {
+    id: '1234567890138',
+    articleGroupSupplier: '11111',
+    brand: 'gstar',
+    collectionSupplier: 'SUMMER 2022',
+    colorCodeSupplier: '200',
+    colorFamily: 'Blue',
+    size: 'L',
+    sizeSupplier: 'L',
+  },
 ]
 
 const articleGroupMapping = [
@@ -190,6 +200,36 @@ const fallbackMapping = [
     ],
   },
 ]
+
+const stackedMapping = [
+  {
+    id: 'gstar',
+    comment: 'LatestCollection level mapping',
+    propertyMapping: [
+      {
+        category: 'ProductGroup',
+        from: '12345',
+        to: 'LAT-articleGroupMapping',
+      },
+      {
+        category: 'ProductGroup',
+        from: '11111',
+        to: 'LAT-articleGroupMapping',
+      },
+    ],
+  },
+  {
+    id: 'gstar',
+    comment: 'Tenant level mapping',
+    propertyMapping: [
+      {
+        category: 'ProductGroup',
+        from: '12345',
+        to: 'TENANT-articleGroupMapping',
+      },
+    ],
+  },
+]
 describe('applyPropertyMapping', () => {
   it('returns empty array on an empty array', function () {
     expect(applyPropertyMapping([], []).length).to.equal(0)
@@ -345,4 +385,10 @@ describe('applyPropertyMapping', () => {
     expect(cleanedSkus[9]._customsize).to.equal(undefined)
     expect(cleanedSkus[9].collection).to.equal(undefined)
   })
+
+  it('applies mapping from different sources', function () {
+    const mappedSkus = applyPropertyMapping(deepCopy(skus), stackedMapping)
+    expect(mappedSkus[6].articleGroup).to.equal('TENANT-articleGroupMapping')
+    expect(mappedSkus[10].articleGroup).to.equal('LAT-articleGroupMapping')
+  })
 })

package/test/sizeToMap.js

@@ -0,0 +1,17 @@
+const { sizeToMap } = require('../dist/index')
+const { expect } = require('chai')
+
+describe('sizeToMap function', function () {
+  it('should return an empty string on non-string inputs', function () {
+    expect(sizeToMap(3)).to.equal('')
+  })
+  it('should return the input with spaces spaces', function () {
+    expect(sizeToMap(' 65 B ')).to.equal('65B')
+  })
+  it("should return the input with comma's replaced with dots", function () {
+    expect(sizeToMap('32,32')).to.equal('32.32')
+  })
+  it('should return the input as uppercase', function () {
+    expect(sizeToMap('xxl')).to.equal('XXL')
+  })
+})

package/tsconfig.json

@@ -3,7 +3,7 @@
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
     /* Basic Options */
     // "incremental": true,                         /* Enable incremental compilation */
-    "target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+    "target": "es2021" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
     "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
     // "lib": [],                                   /* Specify library files to be included in the compilation. */
     // "allowJs": true,                             /* Allow javascript files to be compiled. */