Handle range merging if left or right is union

Author: rubensworks

lib/preprocess/GenericsContext.ts

@@ -250,6 +250,31 @@ export class GenericsContext {
 
       return rangeA;
     }
+
+    // Handle left or right being a union
+    if (rangeA.isA('ParameterRangeUnion')) {
+      return this.mergeUnion(rangeA, rangeB);
+    }
+    if (rangeB.isA('ParameterRangeUnion')) {
+      return this.mergeUnion(rangeB, rangeA);
+    }
+  }
+
+  protected mergeUnion(rangeUnion: Resource, rangeOther: Resource): Resource | undefined {
+    const elements = rangeUnion.properties.parameterRangeElements;
+    const mergedValues = elements
+      .map(element => this.mergeRanges(rangeOther, element))
+      .filter(Boolean);
+    if (mergedValues.length === 0) {
+      return;
+    }
+    if (mergedValues.length === 1) {
+      return mergedValues[0];
+    }
+    return this.objectLoader.createCompactedResource({
+      '@type': 'ParameterRangeUnion',
+      parameterRangeElements: mergedValues,
+    });
   }
 
   /**

test/unit/preprocess/GenericsContexts-test.ts

@@ -751,6 +751,112 @@ describe('GenericsContext', () => {
           ),
         ).toBeUndefined();
       });
+
+      it('should return union of matches if left is a union type and right is not', () => {
+        expectOutputProperties(
+          genericsContext.mergeRanges(
+            objectLoader.createCompactedResource({
+              '@type': 'ParameterRangeUnion',
+              parameterRangeElements: [
+                'xsd:integer',
+                'xsd:boolean',
+                'xsd:integer',
+              ],
+            }),
+            objectLoader.createCompactedResource('xsd:integer'),
+          ),
+          objectLoader.createCompactedResource({
+            '@type': 'ParameterRangeUnion',
+            parameterRangeElements: [
+              'xsd:integer',
+              'xsd:integer',
+            ],
+          }),
+        );
+      });
+
+      it('should return union of matches for one match if left is a union type and right is not', () => {
+        expect(
+          genericsContext.mergeRanges(
+            objectLoader.createCompactedResource({
+              '@type': 'ParameterRangeUnion',
+              parameterRangeElements: [
+                'xsd:integer',
+                'xsd:boolean',
+                'xsd:boolean',
+              ],
+            }),
+            objectLoader.createCompactedResource('xsd:integer'),
+          )!.term,
+        ).toEqualRdfTerm(objectLoader.createCompactedResource('xsd:integer')!.term);
+      });
+
+      it('should not merge if union of matches of left does not match right', () => {
+        expect(genericsContext.mergeRanges(
+          objectLoader.createCompactedResource({
+            '@type': 'ParameterRangeUnion',
+            parameterRangeElements: [
+              'xsd:boolean',
+              'xsd:boolean',
+              'xsd:boolean',
+            ],
+          }),
+          objectLoader.createCompactedResource('xsd:integer'),
+        )).toBeUndefined();
+      });
+
+      it('should return union of matches if right is a union type and left is not', () => {
+        expectOutputProperties(
+          genericsContext.mergeRanges(
+            objectLoader.createCompactedResource('xsd:integer'),
+            objectLoader.createCompactedResource({
+              '@type': 'ParameterRangeUnion',
+              parameterRangeElements: [
+                'xsd:integer',
+                'xsd:boolean',
+                'xsd:integer',
+              ],
+            }),
+          ),
+          objectLoader.createCompactedResource({
+            '@type': 'ParameterRangeUnion',
+            parameterRangeElements: [
+              'xsd:integer',
+              'xsd:integer',
+            ],
+          }),
+        );
+      });
+
+      it('should return union of matches for one match if right is a union type and left is not', () => {
+        expect(
+          genericsContext.mergeRanges(
+            objectLoader.createCompactedResource('xsd:integer'),
+            objectLoader.createCompactedResource({
+              '@type': 'ParameterRangeUnion',
+              parameterRangeElements: [
+                'xsd:integer',
+                'xsd:boolean',
+                'xsd:boolean',
+              ],
+            }),
+          )!.term,
+        ).toEqualRdfTerm(objectLoader.createCompactedResource('xsd:integer')!.term);
+      });
+
+      it('should not merge if union of matches of right does not match left', () => {
+        expect(genericsContext.mergeRanges(
+          objectLoader.createCompactedResource('xsd:integer'),
+          objectLoader.createCompactedResource({
+            '@type': 'ParameterRangeUnion',
+            parameterRangeElements: [
+              'xsd:boolean',
+              'xsd:boolean',
+              'xsd:boolean',
+            ],
+          }),
+        )).toBeUndefined();
+      });
     });
 
     describe('isXsdSubType', () => {