Fix generic components not accepting specific types

Author: rubensworks

lib/preprocess/parameterproperty/ParameterPropertyHandlerRange.ts

@@ -224,15 +224,25 @@ export class ParameterPropertyHandlerRange implements IParameterPropertyHandler
           // For the defined generic type instances, apply them into the instance so they can be checked later
           value.properties.genericTypeInstances = paramRange.properties.genericTypeInstances
             .map(genericTypeInstance => {
-              if (!genericTypeInstance.property.parameterRangeGenericType) {
-                throw new ErrorResourcesContext(`Invalid generic type instance in a ParameterRangeGenericComponent was detected: missing parameterRangeGenericType property.`, { parameter: param, genericTypeInstance, value });
+              // If we have a generic param type reference, instantiate them based on the current generics context
+              if (genericTypeInstance.isA('ParameterRangeGenericTypeReference')) {
+                if (!genericTypeInstance.property.parameterRangeGenericType) {
+                  throw new ErrorResourcesContext(`Invalid generic type instance in a ParameterRangeGenericComponent was detected: missing parameterRangeGenericType property.`, {
+                    parameter: param,
+                    genericTypeInstance,
+                    value,
+                  });
+                }
+                return this.objectLoader.createCompactedResource({
+                  type: 'ParameterRangeGenericTypeReference',
+                  parameterRangeGenericType: genericTypeInstance.property.parameterRangeGenericType.value,
+                  parameterRangeGenericBindings: genericsContext
+                    .bindings[genericTypeInstance.property.parameterRangeGenericType.value],
+                });
               }
-              return this.objectLoader.createCompactedResource({
-                type: 'ParameterRangeGenericTypeReference',
-                parameterRangeGenericType: genericTypeInstance.property.parameterRangeGenericType.value,
-                parameterRangeGenericBindings: genericsContext
-                  .bindings[genericTypeInstance.property.parameterRangeGenericType.value],
-              });
+
+              // For all other param types, return the as-is
+              return genericTypeInstance;
             });
         }
         return this.hasParamValueValidType(value, param, paramRange.property.component, genericsContext);

test/unit/preprocess/parameterproperty/ParameterPropertyHandlerRange-test.ts

@@ -1273,6 +1273,35 @@ describe('ParameterPropertyHandlerRange', () => {
         )).toThrow(/^The value ".*" with types "ex:SomeType1" for parameter ".*" is not of required range type "\(ex:SomeType2\)<ex:GEN_T>"/u);
       });
 
+      it('should handle a generic component with a direct type value', () => {
+        const value = handler.captureType(
+          objectLoader.createCompactedResource({
+            '@type': [ 'ex:SomeType1' ],
+          }),
+          objectLoader.createCompactedResource({
+            range: {
+              '@type': 'ParameterRangeGenericComponent',
+              component: 'ex:SomeType1',
+              genericTypeInstances: [
+                {
+                  '@id': 'ex:SomeType2',
+                },
+              ],
+            },
+          }),
+          genericsContext,
+        );
+        expect(value).toBeTruthy();
+        expectOutputProperties(value, objectLoader.createCompactedResource({
+          '@type': [ 'ex:SomeType1' ],
+          genericTypeInstances: [
+            {
+              '@id': 'ex:SomeType2',
+            },
+          ],
+        }));
+      });
+
       it('should throw on a generic component with config that already has manual generics set', () => {
         genericsContext = new GenericsContext(objectLoader, [
           objectLoader.createCompactedResource('ex:GEN_T'),