componentsjs 5.3.0 → 5.3.2

package/components/context.json

@@ -0,0 +1,263 @@
+{
+  "@context": {
+    "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    "xsd": "http://www.w3.org/2001/XMLSchema#",
+    "type": {
+      "@id": "rdf:type"
+    },
+    "types": {
+      "@id": "rdf:type"
+    },
+
+    "oo": "https://linkedsoftwaredependencies.org/vocabularies/object-oriented#",
+    "Module": {
+      "@id": "oo:Module"
+    },
+    "Class": {
+      "@id": "oo:Class"
+    },
+    "AbstractClass": {
+      "@id": "oo:AbstractClass"
+    },
+    "Instance": {
+      "@id": "oo:ComponentInstance"
+    },
+    "components": {
+      "@id": "oo:component"
+    },
+    "component": {
+      "@id": "oo:component",
+      "@type": "@id"
+    },
+    "parameters": {
+      "@id": "oo:parameter"
+    },
+    "memberFields": {
+      "@id": "oo:memberField"
+    },
+    "memberFieldName": {
+      "@id": "oo:memberFieldName"
+    },
+    "genericTypeParameters": {
+      "@id": "oo:genericTypeParameter"
+    },
+    "constructorArguments": {
+      "@id": "oo:constructorArguments",
+      "@container": "@list"
+    },
+    "unique": {
+      "@id": "oo:uniqueValue"
+    },
+    "lazy": {
+      "@id": "oo:lazyValue"
+    },
+    "required": {
+      "@id": "oo:required"
+    },
+    "default": {
+      "@id": "oo:defaultValue"
+    },
+    "defaultScoped": {
+      "@id": "oo:defaultScoped"
+    },
+    "defaultScope": {
+      "@id": "oo:defaultScope",
+      "@type": "@id"
+    },
+    "defaultScopedValue": {
+      "@id": "oo:defaultScopedValue"
+    },
+    "fixed": {
+      "@id": "oo:hasFixedValue"
+    },
+    "arguments": {
+      "@id": "oo:arguments",
+      "@container": "@list"
+    },
+    "undefined": {
+      "@id": "oo:isUndefined"
+    },
+    "Override": {
+      "@id": "oo:Override"
+    },
+    "overrideInstance": {
+      "@id": "oo:overrideInstance"
+    },
+    "overrideParameters": {
+      "@id": "oo:overrideParameters"
+    },
+    "ParameterRange": {
+      "@id": "oo:ParameterRange"
+    },
+    "ParameterRangeUndefined": {
+      "@id": "oo:ParameterRangeUndefined"
+    },
+    "ParameterRangeWildcard": {
+      "@id": "oo:ParameterRangeWildcard"
+    },
+    "ParameterRangeArray": {
+      "@id": "oo:ParameterRangeArray"
+    },
+    "ParameterRangeRest": {
+      "@id": "oo:ParameterRangeRest"
+    },
+    "ParameterRangeKeyof": {
+      "@id": "oo:ParameterRangeKeyof"
+    },
+    "ParameterRangeLiteral": {
+      "@id": "oo:ParameterRangeLiteral"
+    },
+    "parameterRangeValue": {
+      "@id": "oo:parameterRangeValue",
+      "@type": "@id"
+    },
+    "parameterRangeValueLiteral": {
+      "@id": "oo:parameterRangeValue"
+    },
+    "ParameterRangeUnion": {
+      "@id": "oo:ParameterRangeUnion"
+    },
+    "ParameterRangeIntersection": {
+      "@id": "oo:ParameterRangeIntersection"
+    },
+    "ParameterRangeTuple": {
+      "@id": "oo:ParameterRangeTuple"
+    },
+    "parameterRangeElements": {
+      "@id": "oo:parameterRangeElement",
+      "@type": "@id"
+    },
+    "ParameterRangeCollectEntries": {
+      "@id": "oo:ParameterRangeCollectEntries"
+    },
+    "parameterRangeCollectEntriesParameters": {
+      "@id": "oo:parameterRangeCollectEntriesParameter",
+      "@type": "@id"
+    },
+    "ParameterRangeGenericComponent": {
+      "@id": "oo:ParameterRangeGenericComponent"
+    },
+    "genericTypeInstancesComponentScope": {
+      "@id": "oo:genericTypeInstancesComponentScope",
+      "@type": "@id"
+    },
+    "genericTypeInstances": {
+      "@id": "oo:genericTypeInstance",
+      "@type": "@id"
+    },
+    "ParameterRangeGenericTypeReference": {
+      "@id": "oo:ParameterRangeGenericTypeReference"
+    },
+    "parameterRangeGenericType": {
+      "@id": "oo:parameterRangeGenericType",
+      "@type": "@id"
+    },
+    "parameterRangeGenericBindings": {
+      "@id": "oo:parameterRangeGenericBinding",
+      "@type": "@id"
+    },
+    "ParameterRangeIndexed": {
+      "@id": "oo:ParameterRangeIndexed"
+    },
+    "parameterRangeIndexedObject": {
+      "@id": "oo:parameterRangeIndexedObject",
+      "@type": "@id"
+    },
+    "parameterRangeIndexedIndex": {
+      "@id": "oo:parameterRangeIndexedIndex",
+      "@type": "@id"
+    },
+    "GenericComponentExtension": {
+      "@id": "oo:GenericComponentExtension"
+    },
+
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "comment": {
+      "@id": "rdfs:comment"
+    },
+    "extends": {
+      "@id": "rdfs:subClassOf",
+      "@type": "@id"
+    },
+    "range": {
+      "@id": "rdfs:range",
+      "@type": "@id"
+    },
+    "import": {
+      "@id": "rdfs:seeAlso",
+      "@type": "@id"
+    },
+
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "InheritanceValue": {
+      "@id": "owl:Restriction"
+    },
+    "inheritValues": {
+      "@id": "rdfs:subClassOf",
+      "@type": "@id"
+    },
+    "onParameter": {
+      "@id": "owl:onProperty",
+      "@type": "@id"
+    },
+    "from": {
+      "@id": "owl:allValuesFrom",
+      "@type": "@id"
+    },
+
+    "doap": "http://usefulinc.com/ns/doap#",
+    "requireName": {
+      "@id": "doap:name"
+    },
+    "requireElement": {
+      "@id": "oo:componentPath"
+    },
+    "requireNoConstructor": {
+      "@id": "oo:componentNoConstructor"
+    },
+
+    "om": "https://linkedsoftwaredependencies.org/vocabularies/object-mapping#",
+    "ObjectMapping": {
+      "@id": "om:ObjectMapping"
+    },
+    "ArrayMapping": {
+      "@id": "om:ArrayMapping"
+    },
+    "fields": {
+      "@id": "om:field",
+      "@type": "om:ObjectMapEntry",
+      "@container": "@list"
+    },
+    "elements": {
+      "@id": "om:elements",
+      "@type": "@id",
+      "@container": "@list"
+    },
+    "collectEntries": {
+      "@id": "om:collectsEntriesFrom",
+      "@type": "@id",
+      "@container": "@list"
+    },
+    "keyRaw": {
+      "@id": "om:fieldName"
+    },
+    "key": {
+      "@id": "om:fieldName",
+      "@type": "@id"
+    },
+    "value": {
+      "@id": "om:fieldValue",
+      "@type": "@id"
+    },
+    "valueRaw": {
+      "@id": "om:fieldValue"
+    },
+    "valueRawReference": {
+      "@id": "om:fieldValueRaw",
+      "@type": "@id"
+    },
+    "Variable": {
+      "@id": "om:Variable"
+    }
+  }
+}

package/lib/loading/ComponentsManagerBuilder.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentsManagerBuilder = void 0;
-const fs = require("fs");
 const rdf_object_1 = require("rdf-object");
 const winston_1 = require("winston");
 const ComponentsManager_1 = require("../ComponentsManager");
@@ -47,7 +46,7 @@ class ComponentsManagerBuilder {
     }
     static createObjectLoader() {
         return new rdf_object_1.RdfObjectLoader({
-            context: JSON.parse(fs.readFileSync(`${__dirname}/../../components/context.jsonld`, 'utf8')),
+            context: require('../../components/context.json'),
         });
     }
     /**

package/lib/preprocess/ConfigPreprocessorComponent.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigPreprocessorComponent = void 0;
 const Iris_1 = require("../rdf/Iris");
+const ResourceUtil_1 = require("../rdf/ResourceUtil");
 const ErrorResourcesContext_1 = require("../util/ErrorResourcesContext");
 const GenericsContext_1 = require("./GenericsContext");
 /**
@@ -19,14 +20,7 @@ class ConfigPreprocessorComponent {
     canHandle(config) {
         if (!config.property.requireName) {
             // Collect all component types from the resource
-            const componentTypesIndex = {};
-            for (const type of config.properties.types) {
-                const componentResource = this.componentResources[type.value];
-                if (componentResource) {
-                    componentTypesIndex[componentResource.value] = componentResource;
-                }
-            }
-            const componentTypes = Object.values(componentTypesIndex);
+            const componentTypes = (0, ResourceUtil_1.uniqueTypes)(config, this.componentResources);
             // Require either exactly one component type, or a requireName
             if (componentTypes.length > 1) {
                 throw new ErrorResourcesContext_1.ErrorResourcesContext(`Detected more than one component types for config "${config.value}"`, {

package/lib/preprocess/ConfigPreprocessorOverride.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigPreprocessorOverride = void 0;
+const Iris_1 = require("../rdf/Iris");
+const ResourceUtil_1 = require("../rdf/ResourceUtil");
 const ErrorResourcesContext_1 = require("../util/ErrorResourcesContext");
 /**
  * An {@link IConfigPreprocessor} that handles the overriding of parameters.
@@ -67,11 +69,9 @@ class ConfigPreprocessorOverride {
      * Finds all Override resources in the object loader and links them to their target resource.
      */
     *findOverrideTargets() {
-        const overrideUri = this.objectLoader.contextResolved.expandTerm('oo:Override');
-        const overrideInstanceUri = this.objectLoader.contextResolved.expandTerm('oo:overrideInstance');
         for (const [id, resource] of Object.entries(this.objectLoader.resources)) {
-            if (resource.isA(overrideUri) && resource.value !== overrideUri) {
-                const targets = resource.properties[overrideInstanceUri];
+            if (resource.isA(Iris_1.IRIS_OO.Override) && resource.value !== Iris_1.IRIS_OO.Override) {
+                const targets = resource.properties[Iris_1.IRIS_OO.overrideInstance];
                 if (!targets || targets.length === 0) {
                     this.logger.warn(`Missing overrideInstance for ${id}. This Override will be ignored.`);
                     continue;
@@ -163,9 +163,8 @@ class ConfigPreprocessorOverride {
      * @param chain - The chain to find the target of.
      */
     getChainTarget(chain) {
-        const rdfTypeUri = this.objectLoader.contextResolved.expandTerm('rdf:type');
         const target = chain[chain.length - 1];
-        const types = target.properties[rdfTypeUri];
+        const types = (0, ResourceUtil_1.uniqueTypes)(target, this.componentResources);
         if (!types || types.length === 0) {
             throw new ErrorResourcesContext_1.ErrorResourcesContext(`Missing type for override target ${target.value} of Override ${chain[chain.length - 2].value}`, {
                 target,
@@ -187,8 +186,7 @@ class ConfigPreprocessorOverride {
      * @param parameters - The parameters that are relevant for the target.
      */
     filterOverrideObject(override, target, parameters) {
-        const overrideParametersUri = this.objectLoader.contextResolved.expandTerm('oo:overrideParameters');
-        const overrideObjects = override.properties[overrideParametersUri];
+        const overrideObjects = override.properties[Iris_1.IRIS_OO.overrideParameters];
         if (!overrideObjects || overrideObjects.length === 0) {
             this.logger.warn(`No overrideParameters found for ${override.value}.`);
             return {};

package/lib/rdf/Iris.d.ts

@@ -6,6 +6,9 @@ export declare const IRIS_OO: {
     ComponentInstance: string;
     component: string;
     componentPath: string;
+    Override: string;
+    overrideInstance: string;
+    overrideParameters: string;
     parameter: string;
 };
 export declare const PREFIX_OM: (suffix: string) => string;

package/lib/rdf/Iris.js

@@ -10,6 +10,9 @@ exports.IRIS_OO = {
     ComponentInstance: (0, exports.PREFIX_OO)('ComponentInstance'),
     component: (0, exports.PREFIX_OO)('component'),
     componentPath: (0, exports.PREFIX_OO)('componentPath'),
+    Override: (0, exports.PREFIX_OO)('Override'),
+    overrideInstance: (0, exports.PREFIX_OO)('overrideInstance'),
+    overrideParameters: (0, exports.PREFIX_OO)('overrideParameters'),
     parameter: (0, exports.PREFIX_OO)('parameter'),
 };
 exports.PREFIX_OM = definePrefix('https://linkedsoftwaredependencies.org/vocabularies/object-mapping#');

package/lib/rdf/PrefetchedDocumentLoader.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrefetchedDocumentLoader = void 0;
-const fs = require("fs");
 const jsonld_context_parser_1 = require("jsonld-context-parser");
 /**
  * A document loader that first loads from a precomputed set of contexts,
@@ -34,9 +33,7 @@ class PrefetchedDocumentLoader extends jsonld_context_parser_1.FetchDocumentLoad
 }
 exports.PrefetchedDocumentLoader = PrefetchedDocumentLoader;
 PrefetchedDocumentLoader.CONTEXT_URL = 'https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^5.0.0/components/context.jsonld';
-// eslint-disable-next-line no-sync
-PrefetchedDocumentLoader.DEFAULT_CONTEXT = JSON.parse(fs
-    .readFileSync(`${__dirname}/../../components/context.jsonld`, 'utf8'));
+PrefetchedDocumentLoader.DEFAULT_CONTEXT = require('../../components/context.json');
 PrefetchedDocumentLoader.DEFAULT_CONTEXTS = {
     [PrefetchedDocumentLoader.CONTEXT_URL]: PrefetchedDocumentLoader.DEFAULT_CONTEXT,
     // TODO: temporarily also set old context versions for backwards-compatible.

package/lib/rdf/ResourceUtil.d.ts

@@ -0,0 +1,7 @@
+import type { Resource } from 'rdf-object';
+/**
+ * Filters duplicates from the types of the given {@link Resource} and returns all unique entries.
+ * @param resource - The {@link Resource} to filter the types of.
+ * @param componentResources - All the available component resources.
+ */
+export declare function uniqueTypes(resource: Resource, componentResources: Record<string, Resource>): Resource[];

package/lib/rdf/ResourceUtil.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uniqueTypes = void 0;
+/**
+ * Filters duplicates from the types of the given {@link Resource} and returns all unique entries.
+ * @param resource - The {@link Resource} to filter the types of.
+ * @param componentResources - All the available component resources.
+ */
+function uniqueTypes(resource, componentResources) {
+    const componentTypesIndex = {};
+    for (const type of resource.properties.types) {
+        const componentResource = componentResources[type.value];
+        if (componentResource) {
+            componentTypesIndex[componentResource.value] = componentResource;
+        }
+    }
+    return Object.values(componentTypesIndex);
+}
+exports.uniqueTypes = uniqueTypes;
+//# sourceMappingURL=ResourceUtil.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "componentsjs",
-  "version": "5.3.0",
+  "version": "5.3.2",
   "description": "A semantic dependency injection framework",
   "lsd:contexts": {
     "https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^5.0.0/components/context.jsonld": "components/context.jsonld"
@@ -23,9 +23,13 @@
     "node": ">=8.0"
   },
   "scripts": {
-    "test": "jest ${1}",
+    "test": "npm run test:jest && npm run test:webpack",
+    "test:jest": "jest ${1}",
+    "test:webpack": "npm run test:webpack:node && npm run test:webpack:web",
+    "test:webpack:node": "webpack -c test/webpack/webpack.config.js && node test/webpack/build/test.min.js",
+    "test:webpack:web": "webpack -c test/webpack/webpack.config-web.js && node test/webpack/build-web/test.min.js",
     "test-watch": "jest ${1} --watch",
-    "build": "tsc && chmod +x ./bin/compile-config.js",
+    "build": "scopy ./components/context.jsonld ./components/context.json && tsc && chmod +x ./bin/compile-config.js",
     "build-watch": "tsc --watch",
     "lint": "eslint . --ext .ts --cache",
     "validate": "npm ls",
@@ -51,6 +55,8 @@
   "devDependencies": {
     "@rubensworks/eslint-config": "^1.0.1",
     "@types/jest": "^27.0.0",
+    "@types/stream-to-array": "^2.3.0",
+    "@types/streamify-string": "^1.0.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint": "^7.12.1",
@@ -65,10 +71,16 @@
     "jshint": "^2.1.10",
     "manual-git-changelog": "^1.0.1",
     "n3": "^1.11.1",
+    "node-polyfill-webpack-plugin": "^2.0.1",
     "pre-commit": "^1.2.2",
+    "simple-copy": "^2.2.1",
+    "stream-to-array": "^2.3.0",
     "streamify-string": "^1.0.1",
     "ts-jest": "^27.0.1",
-    "typescript": "^4.3.5"
+    "ts-loader": "^9.4.1",
+    "typescript": "^4.3.5",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^4.10.0"
   },
   "files": [
     "components",