componentsjs 5.0.0-beta.0 → 5.0.0-beta.4

package/lib/preprocess/constructorargumentsmapping/ConstructorArgumentsElementMappingHandlerList.d.ts

@@ -1,4 +1,5 @@
 import type { Resource } from 'rdf-object';
+import type { GenericsContext } from '../GenericsContext';
 import type { IConstructorArgumentsElementMappingHandler } from './IConstructorArgumentsElementMappingHandler';
 import type { IConstructorArgumentsMapper } from './IConstructorArgumentsMapper';
 /**
@@ -6,5 +7,5 @@ import type { IConstructorArgumentsMapper } from './IConstructorArgumentsMapper'
  */
 export declare class ConstructorArgumentsElementMappingHandlerList implements IConstructorArgumentsElementMappingHandler {
     canHandle(configRoot: Resource, constructorArgs: Resource, configElement: Resource, mapper: IConstructorArgumentsMapper): boolean;
-    handle(configRoot: Resource, constructorArgs: Resource, configElement: Resource, mapper: IConstructorArgumentsMapper): Resource;
+    handle(configRoot: Resource, constructorArgs: Resource, configElement: Resource, mapper: IConstructorArgumentsMapper, genericsContext: GenericsContext): Resource;
 }

package/lib/preprocess/constructorargumentsmapping/ConstructorArgumentsElementMappingHandlerList.js

@@ -8,16 +8,18 @@ class ConstructorArgumentsElementMappingHandlerList {
     canHandle(configRoot, constructorArgs, configElement, mapper) {
         return Boolean(constructorArgs.list);
     }
-    handle(configRoot, constructorArgs, configElement, mapper) {
+    handle(configRoot, constructorArgs, configElement, mapper, genericsContext) {
         // Recursively handle all field values.
         const ret = mapper.objectLoader.createCompactedResource({});
         ret.list = [];
         for (const argument of constructorArgs.list) {
             if (argument.property.fields || argument.property.elements) {
-                ret.list.push(mapper.applyConstructorArgumentsParameters(configRoot, argument, configElement));
+                ret.list.push(mapper
+                    .applyConstructorArgumentsParameters(configRoot, argument, configElement, genericsContext));
             }
             else {
-                const value = mapper.getParameterValue(configRoot, argument, configElement, false);
+                const value = mapper
+                    .getParameterValue(configRoot, argument, configElement, false, genericsContext);
                 if (value) {
                     ret.list.push(value);
                 }

package/lib/preprocess/constructorargumentsmapping/IConstructorArgumentsElementMappingHandler.d.ts

@@ -1,4 +1,5 @@
 import type { Resource } from 'rdf-object';
+import type { GenericsContext } from '../GenericsContext';
 import type { IConstructorArgumentsMapper } from './IConstructorArgumentsMapper';
 /**
  * Handles a specific type of a constructor argument element.
@@ -10,8 +11,9 @@ export interface IConstructorArgumentsElementMappingHandler {
      * @param constructorArgs Object mapping definition inside the constructor arguments.
      * @param configElement Part of the config resource to look for parameter instantiations as predicates.
      * @param mapper Instance of the constructor arguments mapper that can be used to handle recursive args.
+     * @param genericsContext Context for generic types.
      */
-    canHandle: (configRoot: Resource, constructorArgs: Resource, configElement: Resource, mapper: IConstructorArgumentsMapper) => boolean;
+    canHandle: (configRoot: Resource, constructorArgs: Resource, configElement: Resource, mapper: IConstructorArgumentsMapper, genericsContext: GenericsContext) => boolean;
     /**
      * Map the given config element with param instantiations
      * to a raw config according to the given constructor arguments definition.
@@ -19,6 +21,7 @@ export interface IConstructorArgumentsElementMappingHandler {
      * @param constructorArgs Object mapping definition inside the constructor arguments.
      * @param configElement Part of the config resource to look for parameter instantiations as predicates.
      * @param mapper Instance of the constructor arguments mapper that can be used to handle recursive args.
+     * @param genericsContext Context for generic types.
      */
-    handle: (configRoot: Resource, constructorArgs: Resource, configElement: Resource, mapper: IConstructorArgumentsMapper) => Resource;
+    handle: (configRoot: Resource, constructorArgs: Resource, configElement: Resource, mapper: IConstructorArgumentsMapper, genericsContext: GenericsContext) => Resource;
 }

package/lib/preprocess/constructorargumentsmapping/IConstructorArgumentsMapper.d.ts

@@ -1,4 +1,5 @@
 import type { RdfObjectLoader, Resource } from 'rdf-object';
+import type { GenericsContext } from '../GenericsContext';
 /**
  * Instances of this interfaces can apply constructor arguments on configs.
  * This is mainly used by {@link IConstructorArgumentsElementMappingHandler}.
@@ -15,14 +16,16 @@ export interface IConstructorArgumentsMapper {
      * @param configRoot The root config resource that we are working in.
      * @param constructorArgs Object mapping definition inside the constructor arguments.
      * @param configElement Part of the config resource to look for parameter instantiations as predicates.
+     * @param genericsContext Context for generic types.
      */
-    applyConstructorArgumentsParameters: (configRoot: Resource, constructorArgs: Resource, configElement: Resource) => Resource;
+    applyConstructorArgumentsParameters: (configRoot: Resource, constructorArgs: Resource, configElement: Resource, genericsContext: GenericsContext) => Resource;
     /**
      * Obtain the value(s) of the given parameter in the given config.
      * @param configRoot The root config resource that we are working in.
      * @param parameter The parameter resource to get the value for.
      * @param configElement Part of the config resource to look for parameter instantiations as predicates.
      * @param rawValue If the IRI represents a raw string value instead of a parameter reference.
+     * @param genericsContext Context for generic types.
      */
-    getParameterValue: (configRoot: Resource, parameter: Resource, configElement: Resource, rawValue: boolean) => Resource | undefined;
+    getParameterValue: (configRoot: Resource, parameter: Resource, configElement: Resource, rawValue: boolean, genericsContext: GenericsContext) => Resource | undefined;
 }

package/lib/preprocess/parameterproperty/IParameterPropertyHandler.d.ts

@@ -1,4 +1,5 @@
 import type { Resource } from 'rdf-object';
+import type { GenericsContext } from '../GenericsContext';
 /**
  * Transforms a parameter value based on some kind of parameter property.
  */
@@ -10,8 +11,9 @@ export interface IParameterPropertyHandler {
      * @param configRoot The root config resource that we are working in.
      * @param parameter The parameter resource to get the value for.
      * @param configElement Part of the config resource to look for parameter instantiations as predicates.
+     * @param genericsContext Context for generic types.
      */
-    canHandle: (value: Resource | undefined, configRoot: Resource, parameter: Resource, configElement: Resource) => boolean;
+    canHandle: (value: Resource | undefined, configRoot: Resource, parameter: Resource, configElement: Resource, genericsContext: GenericsContext) => boolean;
     /**
      * Transform the given parameter value.
      * @param value The current parameter value obtained from the config.
@@ -19,6 +21,7 @@ export interface IParameterPropertyHandler {
      * @param configRoot The root config resource that we are working in.
      * @param parameter The parameter resource to get the value for.
      * @param configElement Part of the config resource to look for parameter instantiations as predicates.
+     * @param genericsContext Context for generic types.
      */
-    handle: (value: Resource | undefined, configRoot: Resource, parameter: Resource, configElement: Resource) => Resource | undefined;
+    handle: (value: Resource | undefined, configRoot: Resource, parameter: Resource, configElement: Resource, genericsContext: GenericsContext) => Resource | undefined;
 }

package/lib/preprocess/parameterproperty/ParameterPropertyHandlerRange.d.ts

@@ -1,4 +1,6 @@
 import type { RdfObjectLoader, Resource } from 'rdf-object';
+import type { IErrorContext } from '../../util/ErrorResourcesContext';
+import { GenericsContext } from '../GenericsContext';
 import type { IParameterPropertyHandler } from './IParameterPropertyHandler';
 /**
  * If a param range is defined, apply the type and validate the range.
@@ -7,7 +9,7 @@ export declare class ParameterPropertyHandlerRange implements IParameterProperty
     private readonly objectLoader;
     constructor(objectLoader: RdfObjectLoader);
     canHandle(value: Resource | undefined, configRoot: Resource, parameter: Resource): boolean;
-    handle(value: Resource | undefined, configRoot: Resource, parameter: Resource, configElement: Resource): Resource | undefined;
+    handle(value: Resource | undefined, configRoot: Resource, parameter: Resource, configElement: Resource, genericsContext: GenericsContext): Resource | undefined;
     /**
      * Apply the given datatype to the given literal.
      * Checks if the datatype is correct and casts to the correct js type.
@@ -15,18 +17,39 @@ export declare class ParameterPropertyHandlerRange implements IParameterProperty
      * Will be ignored if the value is not a literal or the type is not recognized.
      * @param value The value.
      * @param param The parameter.
+     * @param genericsContext Context for generic types.
      */
-    captureType(value: Resource | undefined, param: Resource): Resource | undefined;
+    captureType(value: Resource | undefined, param: Resource, genericsContext: GenericsContext): Resource | undefined;
     /**
-     * Apply the given datatype to the given literal.
-     * Checks if the datatype is correct and casts to the correct js type.
-     * Will throw an error if the type has an invalid value.
-     * Will be ignored if the value is not a literal or the type is not recognized.
+     * Check if the given value is of the given type.
+     *
+     * For valid literals, the `valueRaw` field will be set.
+     *
      * @param value The value.
-     * @param param The parameter.
-     * @param paramRange The parameter's range.
+     * @param type The parameter's range.
+     * @param genericsContext Context for generic types.
+     * @param errorContext The context for error reporting.
+     * @return IParamValueConflict A conflict value if there was an error, or undefined if there was no error
      */
-    hasParamValueValidType(value: Resource | undefined, param: Resource, paramRange: Resource): boolean;
-    protected throwIncorrectTypeError(value: Resource | undefined, parameter: Resource): never;
-    rangeToDisplayString(paramRange: Resource | undefined): string;
+    hasValueType(value: Resource | undefined, type: Resource | undefined, errorContext: IErrorContext, genericsContext: GenericsContext): IParamValueConflict | undefined;
+    static throwIncorrectTypeError(value: Resource | undefined, parameter: Resource, genericsContext: GenericsContext, conflict: IParamValueConflict): never;
+    /**
+     * Check if the given value is of the given type.
+     * @param value A value.
+     * @param type A type.
+     * @param genericsContext The current generics context.
+     * @param genericTypeInstancesComponentScope
+     * @param genericTypeInstances
+     * @param errorContext
+     */
+    hasType(value: Resource, type: Resource, genericsContext: GenericsContext, genericTypeInstancesComponentScope: Resource | undefined, genericTypeInstances: Resource[], errorContext: IErrorContext): IParamValueConflict | undefined;
+    static rangeToDisplayString(paramRange: Resource | undefined, genericsContext: GenericsContext): string;
+}
+/**
+ * Represents a conflict between a value and a type.
+ */
+export interface IParamValueConflict {
+    description: string;
+    context: IErrorContext;
+    causes?: IParamValueConflict[];
 }