@contrail/cli 3.4.10 → 3.4.11-alpha.11e1d43

package/node_modules/@contrail/loader/lib/entity-processor.spec.js

@@ -6,7 +6,7 @@ const entity_builder_helpers_1 = require("./common/entity-builder-helpers");
 const types_1 = require("@contrail/types");
 const entity_types_1 = require("@contrail/entity-types");
 const processor_registry_1 = require("./processor-registry");
-const lodash_1 = require("lodash");
+const chunk_by_url_length_1 = require("./common/chunk-by-url-length");
 const util_1 = require("./common/util");
 const constants_1 = require("./constants");
 jest.mock('./common/entity-builder-helpers');
@@ -14,9 +14,7 @@ jest.mock('./processor-registry');
 jest.mock('@contrail/entity-types');
 jest.mock('./common/entities-helper');
 jest.mock('./common/type-helper');
-jest.mock('lodash', () => ({
-    chunk: jest.fn(),
-}));
+jest.mock('./common/chunk-by-url-length');
 describe('EntityProcessor', () => {
     const mockTypesByPath = {
         color: {
@@ -203,7 +201,7 @@ describe('EntityProcessor', () => {
                 ['1', '2'],
                 ['3', '4'],
             ];
-            lodash_1.chunk.mockReturnValue(chunks);
+            chunk_by_url_length_1.chunkByUrlLength.mockReturnValue(chunks);
             const mockEntities = [
                 { federatedId: '1', name: 'Entity 1' },
                 { federatedId: '2', name: 'Entity 2' },
@@ -214,12 +212,12 @@ describe('EntityProcessor', () => {
                 '1': { federatedId: '1', name: 'Entity 1' },
                 '2': { federatedId: '2', name: 'Entity 2' },
             });
-            expect(lodash_1.chunk).toHaveBeenCalledWith(federatedIds, 200);
+            expect(chunk_by_url_length_1.chunkByUrlLength).toHaveBeenCalledWith(federatedIds);
             expect(entities_helper_1.retryOnTimeout).toHaveBeenCalledTimes(2);
         });
         it('should handle empty federatedIds array', async () => {
             const federatedIds = [];
-            lodash_1.chunk.mockReturnValue([]);
+            chunk_by_url_length_1.chunkByUrlLength.mockReturnValue([]);
             const result = await entity_processor_1.EntityProcessor.fetchCurrentEntities(client, entity_types_1.EntityType.COLOR, federatedIds);
             expect(result).toEqual({});
             expect(entities_helper_1.retryOnTimeout).not.toHaveBeenCalled();
@@ -227,7 +225,7 @@ describe('EntityProcessor', () => {
         it('should handle API errors and rethrow', async () => {
             const federatedIds = ['1'];
             const chunks = [['1']];
-            lodash_1.chunk.mockReturnValue(chunks);
+            chunk_by_url_length_1.chunkByUrlLength.mockReturnValue(chunks);
             const error = new Error('API Error');
             entities_helper_1.retryOnTimeout.mockRejectedValue(error);
             await expect(entity_processor_1.EntityProcessor.fetchCurrentEntities(client, entity_types_1.EntityType.COLOR, federatedIds)).rejects.toThrow('API Error');
@@ -236,7 +234,7 @@ describe('EntityProcessor', () => {
         it('should handle empty response from API', async () => {
             const federatedIds = ['1'];
             const chunks = [['1']];
-            lodash_1.chunk.mockReturnValue(chunks);
+            chunk_by_url_length_1.chunkByUrlLength.mockReturnValue(chunks);
             entities_helper_1.retryOnTimeout.mockResolvedValue([]);
             const result = await entity_processor_1.EntityProcessor.fetchCurrentEntities(client, entity_types_1.EntityType.COLOR, federatedIds);
             expect(result).toEqual({});
@@ -248,7 +246,7 @@ describe('EntityProcessor', () => {
                 ['1', '2'],
                 ['3', '4'],
             ];
-            lodash_1.chunk.mockReturnValue(chunks);
+            chunk_by_url_length_1.chunkByUrlLength.mockReturnValue(chunks);
             const mockEntities1 = [
                 { federatedId: '1', name: 'Entity 1' },
                 { federatedId: '2', name: 'Entity 2' },

package/node_modules/@contrail/loader/lib/pipeline/item-execute-helpers.js

@@ -4,6 +4,7 @@ exports.executeItemEntities = exports.previewItemEntities = exports.splitIntoFam
 const types_1 = require("./types");
 const util_1 = require("@contrail/util");
 const lodash_1 = require("lodash");
+const chunk_by_url_length_1 = require("../common/chunk-by-url-length");
 const entities_helper_1 = require("../entities-v2/entities-helper");
 const type_helper_1 = require("../common/type-helper");
 const pLimit = require('p-limit');
@@ -461,7 +462,7 @@ async function batchUpdateEntities(client, entities, entityName, batchSize, limi
     return { updated, failures };
 }
 async function refreshEntityCache(client, federatedIds, cache) {
-    const chunks = (0, lodash_1.chunk)(federatedIds, 200);
+    const chunks = (0, chunk_by_url_length_1.chunkByUrlLength)(federatedIds);
     const pLimitFetch = pLimit(5);
     const promises = chunks.map((batch) => pLimitFetch(async () => {
         try {

package/node_modules/@contrail/loader/lib/pipeline/project-item-execute-helpers.js

@@ -4,6 +4,7 @@ exports.applyAddedFromSource = exports.executeProjectItemEntities = exports.prev
 const types_1 = require("./types");
 const util_1 = require("@contrail/util");
 const lodash_1 = require("lodash");
+const chunk_by_url_length_1 = require("../common/chunk-by-url-length");
 const entities_helper_1 = require("../entities-v2/entities-helper");
 const type_helper_1 = require("../common/type-helper");
 const item_execute_helpers_1 = require("./item-execute-helpers");
@@ -492,7 +493,7 @@ async function resolveItemsByFederatedId(client, incomingEntities, maxRetries) {
             federatedIds.add(entity.itemOptionFederatedId);
     }
     const result = {};
-    const chunks = (0, lodash_1.chunk)(Array.from(federatedIds), 200);
+    const chunks = (0, chunk_by_url_length_1.chunkByUrlLength)(Array.from(federatedIds));
     const limit = pLimit(5);
     const promises = chunks.map((batch) => limit(async () => {
         try {
@@ -527,7 +528,7 @@ async function fetchCurrentProjectItemsByItemId(client, projectId, itemIds, maxR
     const result = {};
     if (!itemIds.length)
         return result;
-    const chunks = (0, lodash_1.chunk)(itemIds, 200);
+    const chunks = (0, chunk_by_url_length_1.chunkByUrlLength)(itemIds);
     const limit = pLimit(5);
     const promises = chunks.map((batch) => limit(async () => {
         try {

package/node_modules/@contrail/loader/lib/pipeline/transform.js

@@ -192,10 +192,10 @@ function analyzeColumns(rows, typePropertyMaps, config) {
     if (!rows?.length)
         return { columns: [], unmappedTypeProperties: [] };
     const entityTypes = (0, types_2.loadTypeToEntityTypes)(config.loadType);
-    const { typePropertiesBySlug, typePropertiesByLabel } = typePropertyMaps;
+    const { typePropertiesBySlug, typePropertiesByLabel, typePathStateBySlug } = typePropertyMaps;
     const optionSetUsingTypePropertiesBySlug = typePropertyMaps.optionSetUsingTypePropertiesBySlug;
     const csvHeaders = extractUniqueHeaders(rows);
-    const columns = csvHeaders.map((header) => classifyColumn(header, typePropertiesBySlug, typePropertiesByLabel, optionSetUsingTypePropertiesBySlug, entityTypes));
+    const columns = csvHeaders.map((header) => classifyColumn(header, typePropertiesBySlug, typePropertiesByLabel, optionSetUsingTypePropertiesBySlug, entityTypes, typePathStateBySlug));
     const coveredSlugs = new Set();
     for (const column of columns) {
         if (column.matchedSlug) {
@@ -220,7 +220,15 @@ function analyzeColumns(rows, typePropertyMaps, config) {
         }
     }
     const unmappedTypeProperties = Object.entries(typePropertiesBySlug)
-        .filter(([slug, prop]) => !coveredSlugs.has(slug.trim()) && !prop.isArchived)
+        .filter(([slug, prop]) => {
+        const trimmedSlug = slug.trim();
+        if (coveredSlugs.has(trimmedSlug))
+            return false;
+        if (typePathStateBySlug) {
+            return !isArchivedAcrossAllSubtypes(trimmedSlug, typePathStateBySlug);
+        }
+        return !prop.isArchived;
+    })
         .map(([slug, prop]) => ({
         slug: slug.trim(),
         label: prop.label,
@@ -243,7 +251,7 @@ function extractUniqueHeaders(rows) {
     }
     return headers;
 }
-function classifyColumn(header, typePropertiesBySlug, typePropertiesByLabel, optionSetProps, entityTypes) {
+function classifyColumn(header, typePropertiesBySlug, typePropertiesByLabel, optionSetProps, entityTypes, typePathStateBySlug) {
     const isItemLoad = entityTypes.includes(types_1.EntityType.ITEM) || entityTypes.includes(types_1.EntityType.PROJECT_ITEM);
     const isEntityTypeSystemProp = entityTypes.some((et) => ENTITY_TYPE_SYSTEM_PROPERTIES[et]?.has(header));
     const isSystemProp = SYSTEM_PROPERTIES.has(header) || isEntityTypeSystemProp;
@@ -253,7 +261,14 @@ function classifyColumn(header, typePropertiesBySlug, typePropertiesByLabel, opt
     const baseSlugMatch = baseName !== header ? typePropertiesBySlug[baseName] : undefined;
     const matchedProp = slugMatch || labelMatch || baseSlugMatch;
     const isMapped = !!matchedProp || isSystemProp;
-    const isArchived = matchedProp?.isArchived === true;
+    let isArchived;
+    if (matchedProp && typePathStateBySlug) {
+        const matchedSlug = (matchedProp.slug || '').trim();
+        isArchived = isArchivedAcrossAllSubtypes(matchedSlug, typePathStateBySlug);
+    }
+    else {
+        isArchived = matchedProp?.isArchived === true;
+    }
     const hasOptionSet = !!(optionSetProps[header] || optionSetProps[baseName]);
     let isRequired;
     let requiredNote;
@@ -292,6 +307,16 @@ function stripLevelSuffix(name) {
         return name.slice(0, -6);
     return name;
 }
+function isArchivedAcrossAllSubtypes(slug, typePathStateBySlug) {
+    const states = typePathStateBySlug[slug];
+    if (!states || states.size === 0)
+        return false;
+    for (const state of states.values()) {
+        if (!state.isDisabled)
+            return false;
+    }
+    return true;
+}
 const SUBTYPE_ENTITY_TYPES = new Set([types_1.EntityType.ITEM, types_1.EntityType.CUSTOM_ENTITY]);
 const SUBTYPE_PREFIX = {
     [types_1.EntityType.ITEM]: 'item',
@@ -344,12 +369,13 @@ async function fetchTypeDefinitions(client, rows, config) {
     }
     const typeRoots = (0, types_2.entityTypesToTypeRoots)(entityTypes);
     const reducedTypes = await (0, data_transformer_functions_1.getReducedTypes)(typeRoots, client);
-    const { typePropertiesBySlug, typePropertiesByLabel } = (0, data_transformer_functions_1.getPropertiesBySlugAndLabel)(reducedTypes);
+    const { typePropertiesBySlug, typePropertiesByLabel, typePathStateBySlug } = (0, data_transformer_functions_1.getPropertiesBySlugAndLabel)(reducedTypes);
     const optionSetUsingTypePropertiesBySlug = (0, data_transformer_functions_1.getOptionSetsUsingTypePropertiesBySlug)(reducedTypes);
     const typePropertyMaps = {
         typePropertiesBySlug,
         typePropertiesByLabel,
         optionSetUsingTypePropertiesBySlug,
+        typePathStateBySlug,
     };
     const typesByPath = await (0, type_helper_1.buildTypesByPathForPipeline)(client, Array.from(typePaths));
     return { typePropertyMaps, typesByPath, generalErrors };

package/node_modules/@contrail/loader/lib/pipeline/transform.spec.js

@@ -49,7 +49,11 @@ describe('transform', () => {
         getReducedTypesSpy = jest.spyOn(dataTransformerFunctions, 'getReducedTypes')
             .mockResolvedValue([]);
         getPropertiesBySlugAndLabelSpy = jest.spyOn(dataTransformerFunctions, 'getPropertiesBySlugAndLabel')
-            .mockReturnValue({ typePropertiesBySlug: {}, typePropertiesByLabel: {} });
+            .mockReturnValue({
+            typePropertiesBySlug: {},
+            typePropertiesByLabel: {},
+            typePathStateBySlug: {},
+        });
         getOptionSetsUsingTypePropertiesBySlugSpy = jest.spyOn(dataTransformerFunctions, 'getOptionSetsUsingTypePropertiesBySlug')
             .mockReturnValue({});
     });
@@ -170,6 +174,7 @@ describe('transform', () => {
                 active: { slug: 'active', propertyType: 'boolean' },
             },
             typePropertiesByLabel: {},
+            typePathStateBySlug: {},
         });
         const rows = [{ active: 'true', unmappedField: 'true' }];
         const result = await (0, transform_1.transform)(mockClient, rows, baseConfig);
@@ -294,6 +299,11 @@ describe('transform', () => {
         getPropertiesBySlugAndLabelSpy.mockReturnValue({
             typePropertiesBySlug: columnAnalysisTypeMaps.typePropertiesBySlug,
             typePropertiesByLabel: columnAnalysisTypeMaps.typePropertiesByLabel,
+            typePathStateBySlug: {
+                oldProp: new Map([['color', { isDisabled: true }]]),
+                color: new Map([['color', { isDisabled: false }]]),
+                size: new Map([['color', { isDisabled: false }]]),
+            },
         });
         getOptionSetsUsingTypePropertiesBySlugSpy.mockReturnValue(columnAnalysisTypeMaps.optionSetUsingTypePropertiesBySlug);
     }
@@ -328,6 +338,59 @@ describe('transform', () => {
         expect(archivedCol.isArchived).toBe(true);
         expect(archivedCol.isMapped).toBe(true);
     });
+    it('should not mark a column as archived when the property is active in any subtype', async () => {
+        getPropertiesBySlugAndLabelSpy.mockReturnValue({
+            typePropertiesBySlug: {
+                season: { slug: 'season', label: 'Season', propertyType: 'string', isArchived: false },
+            },
+            typePropertiesByLabel: {
+                Season: { slug: 'season', label: 'Season', propertyType: 'string', isArchived: false },
+            },
+            typePathStateBySlug: {
+                season: new Map([
+                    ['item:product', { isDisabled: false }],
+                    ['item:material', { isDisabled: true }],
+                ]),
+            },
+        });
+        getOptionSetsUsingTypePropertiesBySlugSpy.mockReturnValue({});
+        const config = {
+            loadType: [types_1.LoadType.ITEM],
+            conditionalColumns: [{ toProperty: 'typePath', default: 'item:product' }],
+        };
+        const rows = [{ itemFamilyFederatedId: 'fam-1', name: 'Test', season: 'SS25' }];
+        const result = await (0, transform_1.transform)(mockClient, rows, config);
+        const seasonCol = result.columns.find((c) => c.csvHeader === 'season');
+        expect(seasonCol).toBeDefined();
+        expect(seasonCol.isArchived).toBe(false);
+        expect(seasonCol.isMapped).toBe(true);
+    });
+    it('should mark a column as archived only when archived in every subtype that defines it', async () => {
+        getPropertiesBySlugAndLabelSpy.mockReturnValue({
+            typePropertiesBySlug: {
+                legacyProp: { slug: 'legacyProp', label: 'Legacy Prop', propertyType: 'string', isArchived: true },
+            },
+            typePropertiesByLabel: {
+                'Legacy Prop': { slug: 'legacyProp', label: 'Legacy Prop', propertyType: 'string', isArchived: true },
+            },
+            typePathStateBySlug: {
+                legacyProp: new Map([
+                    ['item:product', { isDisabled: true }],
+                    ['item:material', { isDisabled: true }],
+                ]),
+            },
+        });
+        getOptionSetsUsingTypePropertiesBySlugSpy.mockReturnValue({});
+        const config = {
+            loadType: [types_1.LoadType.ITEM],
+            conditionalColumns: [{ toProperty: 'typePath', default: 'item:product' }],
+        };
+        const rows = [{ itemFamilyFederatedId: 'fam-1', name: 'Test', legacyProp: 'value' }];
+        const result = await (0, transform_1.transform)(mockClient, rows, config);
+        const legacyCol = result.columns.find((c) => c.csvHeader === 'legacyProp');
+        expect(legacyCol).toBeDefined();
+        expect(legacyCol.isArchived).toBe(true);
+    });
     it('should mark system properties as required for non-item loads', async () => {
         setupColumnAnalysisMocks();
         const config = { loadType: [types_1.LoadType.COLOR] };

package/node_modules/@contrail/loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/loader",
-  "version": "2.0.2",
+  "version": "2.0.6",
   "description": "Client library for helping with loader jobs.",
   "homepage": "https://archergreysorg.github.io/contrail-loader/",
   "main": "lib/index.js",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.4.10",
+  "version": "3.4.11-alpha.11e1d43",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.4.10",
+  "version": "3.4.11-alpha.11e1d43",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -31,7 +31,7 @@
   ],
   "dependencies": {
     "@contrail/entity-types": "^1.6.1",
-    "@contrail/loader": "^2.0.2",
+    "@contrail/loader": "^2.0.6",
     "@contrail/org-config-migration": "^1.1.13",
     "@contrail/sdk": "^1.5.5",
     "@contrail/types": "^3.1.5",