componentsjs 4.5.0 → 5.0.0-beta.3

package/lib/util/ErrorResourcesContext.js

@@ -1,37 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ErrorResourcesContext = void 0;
-const NodeUtil = require("util");
+const rdf_object_1 = require("rdf-object");
 /**
  * An error that can include a context containing resources for display.
  */
 class ErrorResourcesContext extends Error {
     constructor(message, context) {
-        super(`${message}\n${ErrorResourcesContext.contextToString(context)}`);
+        super(message);
         this.name = 'ErrorResourcesContext';
         this.context = context;
     }
-    static contextToString(context) {
-        return Object.entries(context)
-            .map(([key, value]) => `${key}: ${typeof value === 'string' ?
-            value :
-            // eslint-disable-next-line @typescript-eslint/no-extra-parens
-            (Array.isArray(value) ?
-                value.map(valueSub => ErrorResourcesContext.resourceToString(valueSub)) :
-                ErrorResourcesContext.resourceToString(value))}`)
-            .join('\n');
+    exportContext() {
+        return ErrorResourcesContext.contextToJson(this.context);
     }
-    /**
-     * Convert the given resource to a compact string.
-     * Mainly used for error reporting.
-     *
-     * Note that this will remove certain fields from the resource,
-     * so only use this when throwing an error that will stop the process.
-     *
-     * @param resource A resource.
-     */
-    static resourceToString(resource) {
-        return NodeUtil.inspect(Object.assign({ term: resource.term, properties: resource.properties }, resource.list ? { list: resource.list } : {}), { colors: true, depth: 2 });
+    static contextToJson(context) {
+        return Object.fromEntries(Object.entries(context)
+            .map(([key, value]) => {
+            let mapped;
+            if (typeof value === 'string') {
+                mapped = value;
+            }
+            else if (Array.isArray(value)) {
+                mapped = value.map(valueSub => ErrorResourcesContext.resourceToJson(valueSub));
+            }
+            else if (value instanceof rdf_object_1.Resource || value === undefined) {
+                mapped = ErrorResourcesContext.resourceToJson(value);
+            }
+            else if ('description' in value) {
+                mapped = ErrorResourcesContext.conflictToJson(value);
+            }
+            else {
+                mapped = ErrorResourcesContext.contextToJson(value);
+            }
+            return [key, mapped];
+        }));
+    }
+    static resourceToJson(resource) {
+        if (resource) {
+            return resource.toJSON(1);
+        }
+    }
+    static conflictToJson(conflict) {
+        const data = { description: conflict.description };
+        if (conflict.causes) {
+            data.causes = [];
+            // Only pick the first 2 conflicts for visualization
+            for (const subConflict of conflict.causes.slice(0, 1)) {
+                data.causes.push(ErrorResourcesContext.conflictToJson(subConflict));
+            }
+        }
+        else {
+            data.context = ErrorResourcesContext.contextToJson(conflict.context);
+        }
+        return data;
     }
 }
 exports.ErrorResourcesContext = ErrorResourcesContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "componentsjs",
-  "version": "4.5.0",
+  "version": "5.0.0-beta.3",
   "description": "A semantic dependency injection framework",
   "lsd:contexts": {
     "https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^3.0.0/components/context.jsonld": "components/context.jsonld"
@@ -40,7 +40,7 @@
     "jsonld-context-parser": "^2.1.1",
     "minimist": "^1.2.0",
     "rdf-data-factory": "^1.1.0",
-    "rdf-object": "^1.11.1",
+    "rdf-object": "^1.13.0",
     "rdf-parse": "^1.9.1",
     "rdf-quad": "^1.5.0",
     "rdf-terms": "^1.7.0",

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

@@ -1,11 +0,0 @@
-import type { RdfObjectLoader, Resource } from 'rdf-object';
-import type { IParameterPropertyHandler } from './IParameterPropertyHandler';
-/**
- * If no value has been set, but a value is required, throw.
- */
-export declare class ParameterPropertyHandlerRequired implements IParameterPropertyHandler {
-    private readonly objectLoader;
-    constructor(objectLoader: RdfObjectLoader);
-    canHandle(value: Resource[], configRoot: Resource, parameter: Resource, configElement: Resource): boolean;
-    handle(value: Resource[], configRoot: Resource, parameter: Resource, configElement: Resource): Resource[];
-}

package/lib/preprocess/parameterproperty/ParameterPropertyHandlerRequired.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParameterPropertyHandlerRequired = void 0;
-const ErrorResourcesContext_1 = require("../../util/ErrorResourcesContext");
-/**
- * If no value has been set, but a value is required, throw.
- */
-class ParameterPropertyHandlerRequired {
-    constructor(objectLoader) {
-        this.objectLoader = objectLoader;
-    }
-    canHandle(value, configRoot, parameter, configElement) {
-        return Boolean(value.length === 0 && parameter.property.required);
-    }
-    handle(value, configRoot, parameter, configElement) {
-        throw new ErrorResourcesContext_1.ErrorResourcesContext(`No value was set for required parameter "${parameter.value}"`, {
-            config: configElement,
-            parameter,
-        });
-    }
-}
-exports.ParameterPropertyHandlerRequired = ParameterPropertyHandlerRequired;
-//# sourceMappingURL=ParameterPropertyHandlerRequired.js.map

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

@@ -1,12 +0,0 @@
-import type { RdfObjectLoader } from 'rdf-object';
-import { Resource } from 'rdf-object';
-import type { IParameterPropertyHandler } from './IParameterPropertyHandler';
-/**
- * If the value is singular, and the value should be unique, transform to a single element.
- */
-export declare class ParameterPropertyHandlerUnique implements IParameterPropertyHandler {
-    private readonly objectLoader;
-    constructor(objectLoader: RdfObjectLoader);
-    canHandle(value: Resource[], configRoot: Resource, parameter: Resource, configElement: Resource): boolean;
-    handle(value: Resource[], configRoot: Resource, parameter: Resource, configElement: Resource): Resource[];
-}

package/lib/preprocess/parameterproperty/ParameterPropertyHandlerUnique.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParameterPropertyHandlerUnique = void 0;
-const rdf_object_1 = require("rdf-object");
-/**
- * If the value is singular, and the value should be unique, transform to a single element.
- */
-class ParameterPropertyHandlerUnique {
-    constructor(objectLoader) {
-        this.objectLoader = objectLoader;
-    }
-    canHandle(value, configRoot, parameter, configElement) {
-        return Boolean(parameter.property.unique && parameter.property.unique.value === 'true' && value.length > 0);
-    }
-    handle(value, configRoot, parameter, configElement) {
-        value = [value[0]];
-        // !!!Hack incoming!!!
-        // We make a manual resource to ensure uniqueness from other resources.
-        // This is needed because literals may occur different times in param values.
-        // This ensures that the unique label is only applied to the current occurrence, instead of all occurrences.
-        // TODO: improve this
-        const newValue = new rdf_object_1.Resource({ term: value[0].term, context: this.objectLoader.contextResolved });
-        for (const key of Object.keys(value[0].properties)) {
-            for (const subValue of value[0].properties[key]) {
-                newValue.properties[key].push(subValue);
-            }
-        }
-        value = [newValue];
-        value[0].property.unique = parameter.property.unique;
-        return value;
-    }
-}
-exports.ParameterPropertyHandlerUnique = ParameterPropertyHandlerUnique;
-//# sourceMappingURL=ParameterPropertyHandlerUnique.js.map