Allow param range merging with generic components

Author: rubensworks

lib/preprocess/GenericsContext.ts

@@ -270,6 +270,15 @@ export class GenericsContext {
     if (rangeB.isA('ParameterRangeUnion')) {
       return this.mergeUnion(rangeB, rangeA, typeTypeValidator);
     }
+
+    // Check if the range refers to a component with a generic type
+    // TODO: somehow pass the range's component and genericTypeInstances (like in ParameterPropertyHandlerRange)?
+    if (rangeA.isA('ParameterRangeGenericComponent')) {
+      return this.mergeRanges(rangeA.property.component, rangeB, typeTypeValidator);
+    }
+    if (rangeB.isA('ParameterRangeGenericComponent')) {
+      return this.mergeRanges(rangeB.property.component, rangeA, typeTypeValidator);
+    }
   }
 
   protected mergeUnion(

test/unit/preprocess/GenericsContexts-test.ts

@@ -929,6 +929,58 @@ describe('GenericsContext', () => {
           typeTypeValidatorOnlyIdentical,
         )).toBeUndefined();
       });
+
+      it('should merge with left a generic component', () => {
+        expect(
+          genericsContext.mergeRanges(
+            objectLoader.createCompactedResource({
+              '@type': 'ParameterRangeGenericComponent',
+              component: 'ex:TYPE1',
+            }),
+            objectLoader.createCompactedResource('ex:TYPE1'),
+            typeTypeValidatorOnlyIdentical,
+          )!.term,
+        ).toEqualRdfTerm(objectLoader.createCompactedResource('ex:TYPE1')!.term);
+      });
+
+      it('should not merge with left a non-matching generic component', () => {
+        expect(
+          genericsContext.mergeRanges(
+            objectLoader.createCompactedResource({
+              '@type': 'ParameterRangeGenericComponent',
+              component: 'ex:TYPE1',
+            }),
+            objectLoader.createCompactedResource('ex:TYPE2'),
+            typeTypeValidatorOnlyIdentical,
+          ),
+        ).toBeUndefined();
+      });
+
+      it('should merge with right a generic component', () => {
+        expect(
+          genericsContext.mergeRanges(
+            objectLoader.createCompactedResource('ex:TYPE1'),
+            objectLoader.createCompactedResource({
+              '@type': 'ParameterRangeGenericComponent',
+              component: 'ex:TYPE1',
+            }),
+            typeTypeValidatorOnlyIdentical,
+          )!.term,
+        ).toEqualRdfTerm(objectLoader.createCompactedResource('ex:TYPE1')!.term);
+      });
+
+      it('should not merge with right a non-matching generic component', () => {
+        expect(
+          genericsContext.mergeRanges(
+            objectLoader.createCompactedResource('ex:TYPE2'),
+            objectLoader.createCompactedResource({
+              '@type': 'ParameterRangeGenericComponent',
+              component: 'ex:TYPE1',
+            }),
+            typeTypeValidatorOnlyIdentical,
+          ),
+        ).toBeUndefined();
+      });
     });
 
     describe('isXsdSubType', () => {