npm - @contrail/cli - Versions diffs - 3.5.1-alpha.68d57e0 → 3.5.1-alpha.9da7ac5 - Mend

@contrail/cli 3.5.1-alpha.68d57e0 → 3.5.1-alpha.9da7ac5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

package/README.md CHANGED Viewed

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.5.1-alpha.68d57e0 linux-x64 node-v24.14.1
+@contrail/cli/3.5.1-alpha.9da7ac5 linux-x64 node-v24.14.1
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/node_modules/@contrail/loader/lib/color-processor.js CHANGED Viewed

@@ -5,7 +5,14 @@ const entity_types_1 = require("@contrail/entity-types");
 const base_processor_1 = require("./base-processor");
 const entity_processor_1 = require("./entity-processor");
 const constants_1 = require("./constants");
-const color_validation_1 = require("./common/color-validation");
+function removeHexHash(data) {
+    for (const row of data ?? []) {
+        if (row.hex?.startsWith('#')) {
+            row.hex = row.hex.slice(1);
+        }
+    }
+    return data;
+}
 class ColorProcessor extends base_processor_1.BaseProcessor {
     static typesToTransformBy = ['color'];
     static requiredProperties = ['typePath', 'typeId', 'federatedId', 'name', 'hex', 'red', 'green', 'blue'];
@@ -13,7 +20,7 @@ class ColorProcessor extends base_processor_1.BaseProcessor {
         if (!data) {
             return [];
         }
-        return (0, color_validation_1.applyHexPriorityToRows)(data);
+        return removeHexHash(data);
     }
     static validateTypePath(data, config, csvHeaders, generalErrors) {
         const typePathSource = {
@@ -49,13 +56,20 @@ class ColorProcessor extends base_processor_1.BaseProcessor {
     static validateLoadFile(data, config) {
         const { errors, warnings, generalErrors, generalWarnings, csvHeaders } = entity_processor_1.EntityProcessor.validateLoadFile(data, config, entity_types_1.LoadType.COLOR);
         this.validateTypePath(data, config, csvHeaders, generalErrors);
-        data.forEach((row, index) => {
-            const { rowErrors, rowWarnings } = (0, color_validation_1.buildColorRowIssues)(row, index + 2, config?.federatedMappings);
-            if (rowErrors)
-                errors.push(rowErrors);
-            if (rowWarnings)
-                warnings.push(rowWarnings);
-        });
+        const redColumn = config?.federatedMappings?.red || 'red';
+        const blueColumn = config?.federatedMappings?.blue || 'blue';
+        const greenColumn = config?.federatedMappings?.green || 'green';
+        const hexColumn = config?.federatedMappings?.hex || 'hex';
+        const hasRedColumn = csvHeaders.includes(redColumn);
+        const hasBlueColumn = csvHeaders.includes(blueColumn);
+        const hasGreenColumn = csvHeaders.includes(greenColumn);
+        const hasHexColumn = csvHeaders.includes(hexColumn);
+        if (hasHexColumn && hasRedColumn && hasGreenColumn && hasBlueColumn) {
+            generalWarnings.push({
+                message: constants_1.COLOR_PROCESSOR_WARNINGS.HEX_IGNORED_WARNING,
+                issueType: entity_types_1.IssueType.CONFIG,
+            });
+        }
         return { errors, warnings, generalErrors, generalWarnings };
     }
 }

package/node_modules/@contrail/loader/lib/color-processor.spec.js CHANGED Viewed

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const color_processor_1 = require("./color-processor");
 const entity_types_1 = require("@contrail/entity-types");
 const constants_1 = require("./constants");
-const color_validation_1 = require("./common/color-validation");
 describe('ColorProcessor', () => {
     const loaderProcess = {
         id: 'mock-loader-process-id',
@@ -220,38 +219,72 @@ describe('ColorProcessor', () => {
             });
         });
         describe('color column validation', () => {
-            it('warns per-row when both hex and RGB are populated (hex prioritized)', () => {
+            it('should warn when both hex and RGB columns are present', () => {
                 const data = [
-                    { name: 'test-color', red: '255', green: '0', blue: '0', hex: '#ff0000' },
-                ];
-                const result = color_processor_1.ColorProcessor.validateLoadFile(data, loaderProcess);
-                expect(result.warnings).toEqual([
                     {
-                        rowNumber: 2,
-                        columnIssues: [
-                            {
-                                columnName: 'hex',
-                                message: color_validation_1.COLOR_VALIDATION_MESSAGES.HEX_PRIORITIZED_OVER_RGB,
-                                issueType: entity_types_1.IssueType.INVALID_DATA,
-                                data: JSON.stringify(data[0]),
-                            },
-                        ],
+                        name: 'test-color',
+                        red: '255',
+                        green: '0',
+                        blue: '0',
+                        hex: '#ff0000',
+                    },
+                ];
+                const config = {
+                    ...loaderProcess,
+                    federatedMappings: {
+                        ...loaderProcess.federatedMappings,
+                        red: 'red',
+                        green: 'green',
+                        blue: 'blue',
+                        hex: 'hex',
                     },
-                ]);
+                };
+                const result = color_processor_1.ColorProcessor.validateLoadFile(data, config);
+                expect(result.generalWarnings).toContainEqual({
+                    message: constants_1.COLOR_PROCESSOR_WARNINGS.HEX_IGNORED_WARNING,
+                    issueType: entity_types_1.IssueType.CONFIG,
+                });
             });
-            it('does not warn when only RGB is populated and all components are valid', () => {
-                const data = [{ name: 'test-color', red: '255', green: '0', blue: '0' }];
-                const result = color_processor_1.ColorProcessor.validateLoadFile(data, loaderProcess);
-                expect(result.warnings).toEqual([]);
-                expect(result.errors).toEqual([]);
+            it('should not warn when only RGB columns are present', () => {
+                const data = [
+                    {
+                        name: 'test-color',
+                        red: '255',
+                        green: '0',
+                        blue: '0',
+                    },
+                ];
+                const config = {
+                    ...loaderProcess,
+                    federatedMappings: {
+                        ...loaderProcess.federatedMappings,
+                        red: 'red',
+                        green: 'green',
+                        blue: 'blue',
+                    },
+                };
+                const result = color_processor_1.ColorProcessor.validateLoadFile(data, config);
+                expect(result.generalWarnings).not.toContainEqual({
+                    message: constants_1.COLOR_PROCESSOR_WARNINGS.HEX_IGNORED_WARNING,
+                    issueType: entity_types_1.IssueType.CONFIG,
+                });
             });
-            it('does not warn when only a valid hex is populated', () => {
+            it('should not warn when only hex column is present', () => {
                 const data = [{ name: 'test-color', hex: '#ff0000' }];
-                const result = color_processor_1.ColorProcessor.validateLoadFile(data, loaderProcess);
-                expect(result.warnings).toEqual([]);
-                expect(result.errors).toEqual([]);
+                const config = {
+                    ...loaderProcess,
+                    federatedMappings: {
+                        ...loaderProcess.federatedMappings,
+                        hex: 'hex',
+                    },
+                };
+                const result = color_processor_1.ColorProcessor.validateLoadFile(data, config);
+                expect(result.generalWarnings).not.toContainEqual({
+                    message: constants_1.COLOR_PROCESSOR_WARNINGS.HEX_IGNORED_WARNING,
+                    issueType: entity_types_1.IssueType.CONFIG,
+                });
             });
-            it('warns per-row when both hex and RGB are populated under federatedMappings', () => {
+            it('should handle custom column names from federatedMappings', () => {
                 const data = [{ name: 'test-color', r: '255', g: '0', b: '0', hexcode: '#ff0000' }];
                 const config = {
                     ...loaderProcess,
@@ -264,94 +297,11 @@ describe('ColorProcessor', () => {
                     },
                 };
                 const result = color_processor_1.ColorProcessor.validateLoadFile(data, config);
-                expect(result.warnings).toEqual([
-                    {
-                        rowNumber: 2,
-                        columnIssues: [
-                            {
-                                columnName: 'hex',
-                                message: color_validation_1.COLOR_VALIDATION_MESSAGES.HEX_PRIORITIZED_OVER_RGB,
-                                issueType: entity_types_1.IssueType.INVALID_DATA,
-                                data: JSON.stringify(data[0]),
-                            },
-                        ],
-                    },
-                ]);
-            });
-            it('errors when hex is invalid', () => {
-                const data = [{ name: 'bad', hex: 'notahex' }];
-                const result = color_processor_1.ColorProcessor.validateLoadFile(data, loaderProcess);
-                expect(result.errors).toHaveLength(1);
-                expect(result.errors[0]).toMatchObject({
-                    rowNumber: 2,
-                    columnIssues: [
-                        {
-                            columnName: 'hex',
-                            message: color_validation_1.COLOR_VALIDATION_MESSAGES.HEX_INVALID('notahex'),
-                            issueType: entity_types_1.IssueType.INVALID_DATA,
-                        },
-                    ],
-                });
-            });
-            it('errors when RGB is partially populated and hex is missing', () => {
-                const data = [{ name: 'partial', red: '255', green: '128' }];
-                const result = color_processor_1.ColorProcessor.validateLoadFile(data, loaderProcess);
-                expect(result.errors).toHaveLength(1);
-                expect(result.errors[0].rowNumber).toBe(2);
-                expect(result.errors[0].columnIssues).toEqual([
-                    {
-                        columnName: 'blue',
-                        message: color_validation_1.COLOR_VALIDATION_MESSAGES.RGB_INCOMPLETE(['blue']),
-                        issueType: entity_types_1.IssueType.INVALID_DATA,
-                        data: JSON.stringify(data[0]),
-                    },
-                ]);
-            });
-            it('errors when an RGB component is out of range or non-numeric', () => {
-                const data = [
-                    { name: 'bad-red', red: '300', green: '0', blue: '0' },
-                    { name: 'nan-green', red: '10', green: 'foo', blue: '0' },
-                ];
-                const result = color_processor_1.ColorProcessor.validateLoadFile(data, loaderProcess);
-                expect(result.errors).toHaveLength(2);
-                expect(result.errors[0]).toMatchObject({
-                    rowNumber: 2,
-                    columnIssues: [
-                        { columnName: 'red', message: color_validation_1.COLOR_VALIDATION_MESSAGES.RGB_OUT_OF_RANGE('red', '300') },
-                    ],
-                });
-                expect(result.errors[1]).toMatchObject({
-                    rowNumber: 3,
-                    columnIssues: [
-                        { columnName: 'green', message: color_validation_1.COLOR_VALIDATION_MESSAGES.RGB_OUT_OF_RANGE('green', 'foo') },
-                    ],
+                expect(result.generalWarnings).toContainEqual({
+                    message: constants_1.COLOR_PROCESSOR_WARNINGS.HEX_IGNORED_WARNING,
+                    issueType: entity_types_1.IssueType.CONFIG,
                 });
             });
-            it('does not error when neither hex nor RGB are populated (defaults to black)', () => {
-                const data = [{ name: 'no-color' }];
-                const result = color_processor_1.ColorProcessor.validateLoadFile(data, loaderProcess);
-                expect(result.errors).toEqual([]);
-                expect(result.warnings).toEqual([]);
-            });
-        });
-    });
-    describe('transformData (hex priority)', () => {
-        it('strips red/green/blue when hex is valid', () => {
-            const data = [
-                { hex: '#ff0000', red: '255', green: '0', blue: '0', name: 'red' },
-            ];
-            const result = color_processor_1.ColorProcessor.transformData(data);
-            expect(result).toEqual([{ hex: 'ff0000', name: 'red' }]);
-        });
-        it('keeps red/green/blue and removes empty hex when hex is missing', () => {
-            const data = [{ red: '255', green: '0', blue: '0', name: 'red' }];
-            const result = color_processor_1.ColorProcessor.transformData(data);
-            expect(result).toEqual([{ red: '255', green: '0', blue: '0', name: 'red' }]);
-        });
-        it('defaults to #000000 (without hash) when neither hex nor full RGB is provided', () => {
-            const data = [{ name: 'fallback' }];
-            const result = color_processor_1.ColorProcessor.transformData(data);
-            expect(result).toEqual([{ name: 'fallback', hex: color_validation_1.DEFAULT_HEX }]);
         });
     });
 });

package/node_modules/@contrail/loader/lib/common/chunk-by-url-length.d.ts CHANGED Viewed

@@ -2,5 +2,5 @@ interface ChunkByUrlLengthOptions {
     maxBytes?: number;
     maxCount?: number;
 }
-export declare function chunkByUrlLength(ids: readonly string[] | null | undefined, options?: ChunkByUrlLengthOptions): string[][];
+export declare function chunkByUrlLength(ids: string[], options?: ChunkByUrlLengthOptions): string[][];
 export {};

package/node_modules/@contrail/loader/lib/common/chunk-by-url-length.js CHANGED Viewed

@@ -6,8 +6,6 @@ function wireEncodedLength(id) {
     return encodeURIComponent(id.replace(/,/g, '_COMMA_')).length;
 }
 function chunkByUrlLength(ids, options = {}) {
-    if (!ids?.length)
-        return [];
     const maxBytes = options.maxBytes ?? constants_1.FEDERATED_ID_FETCH_MAX_URL_BYTES;
     const maxCount = options.maxCount ?? constants_1.FEDERATED_ID_FETCH_MAX_COUNT;
     const result = [];

package/node_modules/@contrail/loader/lib/common/chunk-by-url-length.spec.js CHANGED Viewed

@@ -5,10 +5,6 @@ describe('chunkByUrlLength', () => {
     it('returns an empty array for empty input', () => {
         expect((0, chunk_by_url_length_1.chunkByUrlLength)([])).toEqual([]);
     });
-    it('returns an empty array for null/undefined input (matches lodash.chunk behavior)', () => {
-        expect((0, chunk_by_url_length_1.chunkByUrlLength)(undefined)).toEqual([]);
-        expect((0, chunk_by_url_length_1.chunkByUrlLength)(null)).toEqual([]);
-    });
     it('packs short ids into a single chunk up to maxCount', () => {
         const ids = Array.from({ length: 50 }, (_, i) => `id-${i}`);
         const chunks = (0, chunk_by_url_length_1.chunkByUrlLength)(ids, { maxCount: 200, maxBytes: 10000 });

package/node_modules/@contrail/loader/lib/common/size-range-helpers.js CHANGED Viewed

@@ -53,6 +53,7 @@ class SizeRangeSanitizer {
                 }
                 const typePropertySlugs = type?.typeProperties?.map((x) => x.slug);
                 if ((0, lodash_1.intersection)(typePropertySlugs, [exports.SIZE_RANGE_SLUG, exports.SIZE_RANGE_TEMPLATE_SLUG]).length !== 2) {
+                    console.debug(`No size ranges for type ${JSON.stringify(type, null, 2)}, skipping.`);
                     continue;
                 }
                 validTypePaths.push(typePath);

package/node_modules/@contrail/loader/lib/constants.d.ts CHANGED Viewed

@@ -1,6 +1,9 @@
 export declare const COLOR_PROCESSOR_ERRORS: {
     readonly TYPEPATH_MISSING: "\"typePath\" with value \"color\" is required property but is not found in the federatedMapping config, conditionalColumns config, or as a header in the CSV file. Please add a mapping \"typePath\" mapping with value \"color\" with one of these methods, then try the load again.";
 };
+export declare const COLOR_PROCESSOR_WARNINGS: {
+    readonly HEX_IGNORED_WARNING: "\"Hex\" is ignored when red, green, and blue columns are present";
+};
 export declare const CUSTOM_ENTITY_PROCESSOR_ERRORS: {
     readonly TYPEPATH_MISSING: "\"typePath\" with value \"custom-entity:<subtypepath>\" is required property but is not found in the federatedMapping config, conditionalColumns config, or as a header in the CSV file. Please add a mapping \"typePath\" mapping with value \"custom-entity:<subtypepath>\" with one of these methods, then try the load again.";
 };

package/node_modules/@contrail/loader/lib/constants.js CHANGED Viewed

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ITEM_PROCESSOR_WARNINGS = exports.FEDERATED_ID_FETCH_MAX_COUNT = exports.FEDERATED_ID_FETCH_MAX_URL_BYTES = exports.ITEM_PROCESSOR_ERRORS = exports.ENTITY_PROCESSOR_ERRORS = exports.CUSTOM_ENTITY_PROCESSOR_ERRORS = exports.COLOR_PROCESSOR_ERRORS = void 0;
+exports.ITEM_PROCESSOR_WARNINGS = exports.FEDERATED_ID_FETCH_MAX_COUNT = exports.FEDERATED_ID_FETCH_MAX_URL_BYTES = exports.ITEM_PROCESSOR_ERRORS = exports.ENTITY_PROCESSOR_ERRORS = exports.CUSTOM_ENTITY_PROCESSOR_ERRORS = exports.COLOR_PROCESSOR_WARNINGS = exports.COLOR_PROCESSOR_ERRORS = void 0;
 exports.COLOR_PROCESSOR_ERRORS = {
     TYPEPATH_MISSING: '"typePath" with value "color" is required property but is not found in the federatedMapping config, conditionalColumns config, or as a header in the CSV file. Please add a mapping "typePath" mapping with value "color" with one of these methods, then try the load again.',
 };
+exports.COLOR_PROCESSOR_WARNINGS = {
+    HEX_IGNORED_WARNING: '"Hex" is ignored when red, green, and blue columns are present',
+};
 exports.CUSTOM_ENTITY_PROCESSOR_ERRORS = {
     TYPEPATH_MISSING: '"typePath" with value "custom-entity:<subtypepath>" is required property but is not found in the federatedMapping config, conditionalColumns config, or as a header in the CSV file. Please add a mapping "typePath" mapping with value "custom-entity:<subtypepath>" with one of these methods, then try the load again.',
 };

package/node_modules/@contrail/loader/lib/entities-v2/colors-v2/color-processor-v2.js CHANGED Viewed

@@ -6,7 +6,14 @@ const util_1 = require("../../common/util");
 const entity_processor_v2_1 = require("../entity-processor-v2");
 const constants_1 = require("../../constants");
 const base_processor_v2_1 = require("../base-processor-v2");
-const color_validation_1 = require("../../common/color-validation");
+function removeHexHash(data) {
+    for (const row of data ?? []) {
+        if (row.hex?.startsWith('#')) {
+            row.hex = row.hex.slice(1);
+        }
+    }
+    return data;
+}
 class ColorProcessorV2 extends base_processor_v2_1.BaseProcessorV2 {
     static requiredProperties = ['typePath', 'typeId', 'federatedId', 'name', 'hex', 'red', 'green', 'blue'];
     static canAddProperty(allPropertiesSlugs, propertyName) {
@@ -16,7 +23,7 @@ class ColorProcessorV2 extends base_processor_v2_1.BaseProcessorV2 {
         if (!data) {
             return [];
         }
-        return (0, color_validation_1.applyHexPriorityToRows)(data);
+        return removeHexHash(data);
     }
     static validateLoadFile(data, config) {
         const { errors, warnings, generalErrors, generalWarnings, csvHeaders, returnImmediately } = entity_processor_v2_1.EntityProcessorV2.validateLoadFile(data, config);
@@ -34,13 +41,20 @@ class ColorProcessorV2 extends base_processor_v2_1.BaseProcessorV2 {
         if (duplicateFederatedIdErrors.length) {
             errors.push(...duplicateFederatedIdErrors);
         }
-        data.forEach((row, index) => {
-            const { rowErrors, rowWarnings } = (0, color_validation_1.buildColorRowIssues)(row, index + 2, config?.federatedMappings);
-            if (rowErrors)
-                errors.push(rowErrors);
-            if (rowWarnings)
-                warnings.push(rowWarnings);
-        });
+        const redColumn = config?.federatedMappings?.red || 'red';
+        const blueColumn = config?.federatedMappings?.blue || 'blue';
+        const greenColumn = config?.federatedMappings?.green || 'green';
+        const hexColumn = config?.federatedMappings?.hex || 'hex';
+        const hasRedColumn = csvHeaders.includes(redColumn);
+        const hasBlueColumn = csvHeaders.includes(blueColumn);
+        const hasGreenColumn = csvHeaders.includes(greenColumn);
+        const hasHexColumn = csvHeaders.includes(hexColumn);
+        if (hasHexColumn && hasRedColumn && hasGreenColumn && hasBlueColumn) {
+            generalWarnings.push({
+                message: constants_1.COLOR_PROCESSOR_WARNINGS.HEX_IGNORED_WARNING,
+                issueType: entity_types_1.IssueType.CONFIG,
+            });
+        }
         return { errors, warnings, generalErrors, generalWarnings };
     }
     static validateTypePath(data, config, csvHeaders, generalErrors) {

package/node_modules/@contrail/loader/lib/entities-v2/colors-v2/color-processor-v2.spec.js CHANGED Viewed

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const constants_1 = require("../../constants");
 const color_processor_v2_1 = require("./color-processor-v2");
 const entity_types_1 = require("@contrail/entity-types");
-const color_validation_1 = require("../../common/color-validation");
 describe('ColorProcessorV2', () => {
     const loaderProcess = {
         id: 'mock-loader-process-id',
@@ -220,38 +219,72 @@ describe('ColorProcessorV2', () => {
             });
         });
         describe('color column validation', () => {
-            it('warns per-row when both hex and RGB are populated (hex prioritized)', () => {
+            it('should warn when both hex and RGB columns are present', () => {
                 const data = [
-                    { name: 'test-color', red: '255', green: '0', blue: '0', hex: '#ff0000' },
-                ];
-                const result = color_processor_v2_1.ColorProcessorV2.validateLoadFile(data, loaderProcess);
-                expect(result.warnings).toEqual([
                     {
-                        rowNumber: 2,
-                        columnIssues: [
-                            {
-                                columnName: 'hex',
-                                message: color_validation_1.COLOR_VALIDATION_MESSAGES.HEX_PRIORITIZED_OVER_RGB,
-                                issueType: entity_types_1.IssueType.INVALID_DATA,
-                                data: JSON.stringify(data[0]),
-                            },
-                        ],
+                        name: 'test-color',
+                        red: '255',
+                        green: '0',
+                        blue: '0',
+                        hex: '#ff0000',
+                    },
+                ];
+                const config = {
+                    ...loaderProcess,
+                    federatedMappings: {
+                        ...loaderProcess.federatedMappings,
+                        red: 'red',
+                        green: 'green',
+                        blue: 'blue',
+                        hex: 'hex',
                     },
-                ]);
+                };
+                const result = color_processor_v2_1.ColorProcessorV2.validateLoadFile(data, config);
+                expect(result.generalWarnings).toContainEqual({
+                    message: constants_1.COLOR_PROCESSOR_WARNINGS.HEX_IGNORED_WARNING,
+                    issueType: entity_types_1.IssueType.CONFIG,
+                });
             });
-            it('does not warn when only RGB is populated and all components are valid', () => {
-                const data = [{ name: 'test-color', red: '255', green: '0', blue: '0' }];
-                const result = color_processor_v2_1.ColorProcessorV2.validateLoadFile(data, loaderProcess);
-                expect(result.warnings).toEqual([]);
-                expect(result.errors).toEqual([]);
+            it('should not warn when only RGB columns are present', () => {
+                const data = [
+                    {
+                        name: 'test-color',
+                        red: '255',
+                        green: '0',
+                        blue: '0',
+                    },
+                ];
+                const config = {
+                    ...loaderProcess,
+                    federatedMappings: {
+                        ...loaderProcess.federatedMappings,
+                        red: 'red',
+                        green: 'green',
+                        blue: 'blue',
+                    },
+                };
+                const result = color_processor_v2_1.ColorProcessorV2.validateLoadFile(data, config);
+                expect(result.generalWarnings).not.toContainEqual({
+                    message: constants_1.COLOR_PROCESSOR_WARNINGS.HEX_IGNORED_WARNING,
+                    issueType: entity_types_1.IssueType.CONFIG,
+                });
             });
-            it('does not warn when only a valid hex is populated', () => {
+            it('should not warn when only hex column is present', () => {
                 const data = [{ name: 'test-color', hex: '#ff0000' }];
-                const result = color_processor_v2_1.ColorProcessorV2.validateLoadFile(data, loaderProcess);
-                expect(result.warnings).toEqual([]);
-                expect(result.errors).toEqual([]);
+                const config = {
+                    ...loaderProcess,
+                    federatedMappings: {
+                        ...loaderProcess.federatedMappings,
+                        hex: 'hex',
+                    },
+                };
+                const result = color_processor_v2_1.ColorProcessorV2.validateLoadFile(data, config);
+                expect(result.generalWarnings).not.toContainEqual({
+                    message: constants_1.COLOR_PROCESSOR_WARNINGS.HEX_IGNORED_WARNING,
+                    issueType: entity_types_1.IssueType.CONFIG,
+                });
             });
-            it('warns per-row when both hex and RGB are populated under federatedMappings', () => {
+            it('should handle custom column names from federatedMappings', () => {
                 const data = [{ name: 'test-color', r: '255', g: '0', b: '0', hexcode: '#ff0000' }];
                 const config = {
                     ...loaderProcess,
@@ -264,94 +297,11 @@ describe('ColorProcessorV2', () => {
                     },
                 };
                 const result = color_processor_v2_1.ColorProcessorV2.validateLoadFile(data, config);
-                expect(result.warnings).toEqual([
-                    {
-                        rowNumber: 2,
-                        columnIssues: [
-                            {
-                                columnName: 'hex',
-                                message: color_validation_1.COLOR_VALIDATION_MESSAGES.HEX_PRIORITIZED_OVER_RGB,
-                                issueType: entity_types_1.IssueType.INVALID_DATA,
-                                data: JSON.stringify(data[0]),
-                            },
-                        ],
-                    },
-                ]);
-            });
-            it('errors when hex is invalid', () => {
-                const data = [{ name: 'bad', hex: 'notahex' }];
-                const result = color_processor_v2_1.ColorProcessorV2.validateLoadFile(data, loaderProcess);
-                expect(result.errors).toHaveLength(1);
-                expect(result.errors[0]).toMatchObject({
-                    rowNumber: 2,
-                    columnIssues: [
-                        {
-                            columnName: 'hex',
-                            message: color_validation_1.COLOR_VALIDATION_MESSAGES.HEX_INVALID('notahex'),
-                            issueType: entity_types_1.IssueType.INVALID_DATA,
-                        },
-                    ],
-                });
-            });
-            it('errors when RGB is partially populated and hex is missing', () => {
-                const data = [{ name: 'partial', red: '255', green: '128' }];
-                const result = color_processor_v2_1.ColorProcessorV2.validateLoadFile(data, loaderProcess);
-                expect(result.errors).toHaveLength(1);
-                expect(result.errors[0].rowNumber).toBe(2);
-                expect(result.errors[0].columnIssues).toEqual([
-                    {
-                        columnName: 'blue',
-                        message: color_validation_1.COLOR_VALIDATION_MESSAGES.RGB_INCOMPLETE(['blue']),
-                        issueType: entity_types_1.IssueType.INVALID_DATA,
-                        data: JSON.stringify(data[0]),
-                    },
-                ]);
-            });
-            it('errors when an RGB component is out of range or non-numeric', () => {
-                const data = [
-                    { name: 'bad-red', red: '300', green: '0', blue: '0' },
-                    { name: 'nan-green', red: '10', green: 'foo', blue: '0' },
-                ];
-                const result = color_processor_v2_1.ColorProcessorV2.validateLoadFile(data, loaderProcess);
-                expect(result.errors).toHaveLength(2);
-                expect(result.errors[0]).toMatchObject({
-                    rowNumber: 2,
-                    columnIssues: [
-                        { columnName: 'red', message: color_validation_1.COLOR_VALIDATION_MESSAGES.RGB_OUT_OF_RANGE('red', '300') },
-                    ],
-                });
-                expect(result.errors[1]).toMatchObject({
-                    rowNumber: 3,
-                    columnIssues: [
-                        { columnName: 'green', message: color_validation_1.COLOR_VALIDATION_MESSAGES.RGB_OUT_OF_RANGE('green', 'foo') },
-                    ],
+                expect(result.generalWarnings).toContainEqual({
+                    message: constants_1.COLOR_PROCESSOR_WARNINGS.HEX_IGNORED_WARNING,
+                    issueType: entity_types_1.IssueType.CONFIG,
                 });
             });
-            it('does not error when neither hex nor RGB are populated (defaults to black)', () => {
-                const data = [{ name: 'no-color' }];
-                const result = color_processor_v2_1.ColorProcessorV2.validateLoadFile(data, loaderProcess);
-                expect(result.errors).toEqual([]);
-                expect(result.warnings).toEqual([]);
-            });
-        });
-        describe('transformData (hex priority)', () => {
-            it('strips red/green/blue when hex is valid', () => {
-                const data = [
-                    { hex: '#ff0000', red: '255', green: '0', blue: '0', name: 'red' },
-                ];
-                const result = color_processor_v2_1.ColorProcessorV2.transformData(data);
-                expect(result).toEqual([{ hex: 'ff0000', name: 'red' }]);
-            });
-            it('keeps red/green/blue and removes empty hex when hex is missing', () => {
-                const data = [{ red: '255', green: '0', blue: '0', name: 'red' }];
-                const result = color_processor_v2_1.ColorProcessorV2.transformData(data);
-                expect(result).toEqual([{ red: '255', green: '0', blue: '0', name: 'red' }]);
-            });
-            it('defaults to #000000 (without hash) when neither hex nor full RGB is provided', () => {
-                const data = [{ name: 'fallback' }];
-                const result = color_processor_v2_1.ColorProcessorV2.transformData(data);
-                expect(result).toEqual([{ name: 'fallback', hex: color_validation_1.DEFAULT_HEX }]);
-            });
         });
         it('should return error if conditionalColumns format is incorrect', () => {
             const data = [{ name: 'color1' }];

package/node_modules/@contrail/loader/lib/entities-v2/entities-helper.js CHANGED Viewed

@@ -67,6 +67,7 @@ async function retryOnTimeout(client, callType, callParams, maxRetries = 3) {
 }
 exports.retryOnTimeout = retryOnTimeout;
 function UpdateNeeded(incoming, existing, fieldsToSkip = [], fieldsToSkipIfOnlyOnExisting = [], type) {
+    console.debug('Comparing existing and incoming objects...');
     const diffs = compareIncomingAndExisting(incoming, existing, fieldsToSkip, fieldsToSkipIfOnlyOnExisting, type);
     return diffs?.length > 0;
 }

package/node_modules/@contrail/loader/lib/entities-v2/linesheet-v2/assortment-processor.js CHANGED Viewed

@@ -253,6 +253,7 @@ class AssortmentProcessor extends base_processor_v2_1.BaseProcessorV2 {
     }
     static async loadObjects(client, data, passedItemsByFederatedId, assortmentId, assortmentIdentifier, typesByTypePath) {
         const { allPropertiesSlugs, typePropertyToValueType } = await (0, item_helper_1.getAssortmentItemProperties)(client, this.requiredProperties, typesByTypePath);
+        console.debug('using assortment types:', JSON.stringify({ allPropertiesSlugs, typePropertyToValueType }, null, 2));
         const { incomingAssortmentItems, badAssortmentItems } = this.processIncomingData(data, allPropertiesSlugs, typePropertyToValueType);
         const targetAssortment = await (0, item_helper_1.getAssortment)(client, assortmentId, assortmentIdentifier, data);
         if (!targetAssortment) {