@contrail/flexplm 1.7.8-alpha.69dcae1 → 1.7.8-alpha.6f9b7d7

package/lib/publish/base-process-publish-assortment.js

@@ -348,6 +348,9 @@ class BaseProcessPublishAssortment {
         const apcDeletes = await this.downloadDeleteChanges(assortmentPublishChange);
         let previousApcDate = Date.parse(apcCreatedOn);
         const sinceDateMilliseconds = sinceDate.getTime();
+        // sinceDate matches a publish timestamp when it is the default (previous publish) or 'numberOfPublishes:N'.
+        // A date-only sinceDate (e.g. 2026-10-08) matches none, so the walk below must stop on the date instead.
+        const hasPublishAtSinceDate = apcHistory.some(apc => Date.parse(apc?.createdOn) === sinceDateMilliseconds);
         console.info('getDeleteChanges(): apc: ' + assortmentPublishChange?.id
             + ', index: ' + currentAPCIndex + ', previousApcCreatedOn: ' + apcCreatedOn);
         //if only 1 apc, no processing needed
@@ -361,7 +364,11 @@ class BaseProcessPublishAssortment {
             for (let i = currentAPCIndex - 1; i > 0; i--) {
                 const workingAPC = apcHistory[i];
                 previousApcDate = Date.parse(workingAPC?.createdOn);
-                if (sinceDateMilliseconds === previousApcDate) {
+                const reachedSinceDate = hasPublishAtSinceDate
+                    ? previousApcDate === sinceDateMilliseconds
+                    : previousApcDate < sinceDateMilliseconds;
+                if (reachedSinceDate) {
+                    console.info('getDeleteChanges(): reached sinceDate at apc: ' + workingAPC?.id);
                     break;
                 }
                 if (workingAPC?.deletes > 0) {

package/lib/publish/base-process-publish-assortment.spec.js

@@ -922,6 +922,60 @@ describe('getDeleteChanges', () => {
         spy.mockRestore();
     });
 });
+describe('getDeleteChanges - how far back the history walk goes', () => {
+    const config = {};
+    const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
+    const dc = new data_converter_1.DataConverter(config, mapFileUtil);
+    // Oldest -> newest. 'current' is the publish being processed.
+    const history = [
+        { id: 'apc0', createdOn: '2025-09-30T00:00:00.000Z', deletes: 5 },
+        { id: 'apc1', createdOn: '2026-09-28T05:48:26.357Z', deletes: 1 },
+        { id: 'apc2', createdOn: '2026-10-08T07:16:43.363Z', deletes: 2 },
+        { id: 'apc3', createdOn: '2026-10-09T02:37:30.292Z', deletes: 3 },
+        { id: 'apc4', createdOn: '2026-10-14T04:23:10.416Z', deletes: 0 },
+        { id: 'current', createdOn: '2026-10-16T15:25:51.965Z', deletes: 0 }
+    ];
+    const current = history[history.length - 1];
+    const baseline = { assortmentItems: [{ itemId: 'stillInPlan' }] };
+    let ppa;
+    let buildSpy;
+    beforeEach(() => {
+        ppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        jest.spyOn(ppa, 'downloadDeleteChanges').mockResolvedValue([]);
+        buildSpy = jest.spyOn(ppa, 'buildDeleteChanges')
+            .mockImplementation(async (apc) => [{ itemId: 'deleted-in-' + apc['id'] }]);
+    });
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+    const walkedApcIds = () => buildSpy.mock.calls.map(call => call[0]['id']);
+    it('does not walk older publishes when sinceDate is the previous publish date (default)', async () => {
+        const result = await ppa.getDeleteChanges(current, history, baseline, new Date(history[4].createdOn));
+        expect(walkedApcIds()).toEqual([]);
+        expect(result).toEqual([]);
+    });
+    it('stops at the first publish before a date-only sinceDate that matches no publish timestamp', async () => {
+        const result = await ppa.getDeleteChanges(current, history, baseline, new Date('2026-10-08T00:00:00.000Z'));
+        // apc3 and apc2 are after the cutoff; apc1 (Sep 28) is before it, so the walk ends there and apc0 is never read.
+        expect(walkedApcIds()).toEqual(['apc3', 'apc2']);
+        expect(result.map(item => item['itemId'])).toEqual(['deleted-in-apc3', 'deleted-in-apc2']);
+    });
+    it('stops at a publish whose timestamp equals sinceDate without reading it (numberOfPublishes)', async () => {
+        await ppa.getDeleteChanges(current, history, baseline, new Date(history[1].createdOn));
+        expect(walkedApcIds()).toEqual(['apc3', 'apc2']);
+    });
+    it('does not walk any publish when a date-only sinceDate is later than the previous publish', async () => {
+        await ppa.getDeleteChanges(current, history, baseline, new Date('2026-10-15T00:00:00.000Z'));
+        expect(walkedApcIds()).toEqual([]);
+    });
+    it('skips deleted items still in the plan and de-duplicates across publishes', async () => {
+        buildSpy.mockImplementation(async (apc) => apc['id'] === 'apc3'
+            ? [{ itemId: 'stillInPlan' }, { itemId: 'sameItem' }]
+            : [{ itemId: 'sameItem' }, { itemId: 'deleted-in-' + apc['id'] }]);
+        const result = await ppa.getDeleteChanges(current, history, baseline, new Date('2026-10-08T00:00:00.000Z'));
+        expect(result.map(item => item['itemId'])).toEqual(['sameItem', 'deleted-in-apc2']);
+    });
+});
 describe('buildDeleteChanges', () => {
     const config = {};
     const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());

package/lib/util/type-utils.spec.js

@@ -191,15 +191,15 @@ describe('filterProperties-color', () => {
     });
 });
 describe('TypeUtils.getTypeById() tests', () => {
-    it('throws a descriptive error when the type does not exist', async () => {
-        const tu = new type_utils_1.TypeUtils();
-        tu['typesObj'] = { getType: jest.fn().mockResolvedValue(null) };
-        await expect(tu.getTypeById('missingTypeId')).rejects.toThrow('type not found for typeId: missingTypeId');
+    it('should throw an error containing the missing type id when the type does not exist', async () => {
+        const typeUtils = new type_utils_1.TypeUtils();
+        typeUtils['typesObj'] = { getType: jest.fn().mockResolvedValue(null) };
+        await expect(typeUtils.getTypeById('missingTypeId')).rejects.toThrow('type not found for typeId: missingTypeId');
     });
-    it('returns the type when it exists', async () => {
-        const tu = new type_utils_1.TypeUtils();
+    it('should return the same type object when the type exists', async () => {
+        const typeUtils = new type_utils_1.TypeUtils();
         const type = { id: 'typeId', typeProperties: [] };
-        tu['typesObj'] = { getType: jest.fn().mockResolvedValue(type) };
-        expect(await tu.getTypeById('typeId')).toBe(type);
+        typeUtils['typesObj'] = { getType: jest.fn().mockResolvedValue(type) };
+        expect(await typeUtils.getTypeById('typeId')).toBe(type);
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/flexplm",
-  "version": "1.7.8-alpha.69dcae1",
+  "version": "1.7.8-alpha.6f9b7d7",
   "description": "Library used for integration with flexplm.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",