chore: rename to source-watch and determine-changes

engines/config-query-sparql-incremental/config/config-default.json

@@ -65,9 +65,9 @@
     "ccqs:config/term-comparator-factory/actors.json",
     "ccqs:config/term-comparator-factory/mediators.json",
 
-    "icqsi:config/guard/mediators.json",
-    "icqsi:config/guard/actors.json",
-    "icqsi:config/resource-watch/mediators.json",
-    "icqsi:config/resource-watch/actors.json"
+    "icqsi:config/determine-changes/mediators.json",
+    "icqsi:config/determine-changes/actors.json",
+    "icqsi:config/source-watch/mediators.json",
+    "icqsi:config/source-watch/actors.json"
   ]
 }

engines/config-query-sparql-incremental/config/context-preprocess/actors.json

@@ -46,7 +46,7 @@
         "invalidateCache": "@comunica/actor-init-query:invalidateCache",
         "dataFactory": "@comunica/actor-init-query:dataFactory",
         "distinctConstruct": "@comunica/actor-init-query:distinctConstruct",
-        "pollingFrequency": "@incremunica/resource-watch:pollingFrequency",
+        "pollingPeriod": "@incremunica/resource-watch:pollingPeriod",
         "deferredEvaluationEventEmitter": "@incremunica/resource-watch:deferredEvaluationEventEmitter"
       }
     },

engines/config-query-sparql-incremental/config/guard/actors.json → engines/config-query-sparql-incremental/config/determine-changes/actors.json

@@ -2,15 +2,15 @@
   "@context": [
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/runner/^4.0.0/components/context.jsonld",
 
-    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-guard-naive/^1.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-determine-changes-naive/^1.0.0/components/context.jsonld"
   ],
   "@id": "urn:comunica:default:Runner",
   "@type": "Runner",
   "actors": [
     {
-      "@id": "urn:comunica:default:guard/actors#naive",
-      "@type": "ActorGuardNaive",
-      "mediatorResourceWatch": { "@id": "urn:comunica:default:resource-watch/mediators#main" },
+      "@id": "urn:comunica:default:determine-changes/actors#naive",
+      "@type": "ActorDetermineChangesNaive",
+      "mediatorSourceWatch": { "@id": "urn:comunica:default:source-watch/mediators#main" },
       "mediatorDereferenceRdf": { "@id": "urn:comunica:default:dereference-rdf/mediators#main" }
     }
   ]

engines/config-query-sparql-incremental/config/guard/mediators.json → engines/config-query-sparql-incremental/config/determine-changes/mediators.json

@@ -1,12 +1,12 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/bus-guard/^1.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/bus-determine-changes/^1.0.0/components/context.jsonld",
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/mediator-number/^4.0.0/components/context.jsonld"
   ],
-  "@id": "urn:comunica:default:guard/mediators#main",
+  "@id": "urn:comunica:default:determine-changes/mediators#main",
   "@type": "MediatorNumber",
   "type": "max",
   "field": "filterFactor",
   "ignoreFailures": true,
-  "bus": { "@id": "ActorGuard:_default_bus" }
+  "bus": { "@id": "ActorDetermineChanges:_default_bus" }
 }

engines/config-query-sparql-incremental/config/query-source-identify-hypermedia/actors.json

@@ -10,7 +10,7 @@
     {
       "@id": "urn:comunica:default:query-source-identify-hypermedia/actors#none",
       "@type": "ActorQuerySourceIdentifyHypermediaNone",
-      "mediatorGuard": { "@id": "urn:comunica:default:guard/mediators#main" },
+      "mediatorDetermineChanges": { "@id": "urn:comunica:default:determine-changes/mediators#main" },
       "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]

engines/config-query-sparql-incremental/config/rdf-metadata-extract/actors.json

@@ -2,7 +2,7 @@
   "@context": [
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/runner/^4.0.0/components/context.jsonld",
 
-    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-rdf-metadata-extract-guard-data/^1.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-rdf-metadata-extract-determine-changes-data/^1.0.0/components/context.jsonld",
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-metadata-extract-hydra-controls/^4.0.0/components/context.jsonld",
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-metadata-extract-hydra-count/^4.0.0/components/context.jsonld",
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-metadata-extract-hydra-pagesize/^4.0.0/components/context.jsonld",
@@ -43,8 +43,8 @@
       "@type": "ActorRdfMetadataExtractPatchSparqlUpdate"
     },
     {
-      "@id": "urn:comunica:default:rdf-metadata-extract/actors#guard-data",
-      "@type": "ActorRdfMetadataExtractGuardData"
+      "@id": "urn:comunica:default:rdf-metadata-extract/actors#determine-changes-data",
+      "@type": "ActorRdfMetadataExtractDetermineChangesData"
     }
   ]
 }

engines/config-query-sparql-incremental/config/resource-watch/actors.json → engines/config-query-sparql-incremental/config/source-watch/actors.json

@@ -2,29 +2,29 @@
   "@context": [
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/runner/^4.0.0/components/context.jsonld",
 
-    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-resource-watch-polling/^1.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-resource-watch-deferred/^1.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-resource-watch-solid-notification-websockets/^1.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-source-watch-polling/^1.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-source-watch-deferred/^1.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-source-watch-solid-notification-websockets/^1.0.0/components/context.jsonld"
   ],
   "@id": "urn:comunica:default:Runner",
   "@type": "Runner",
   "actors": [
     {
-      "@id": "urn:comunica:default:resource-watch/actors#polling",
-      "@type": "ActorResourceWatchPolling",
+      "@id": "urn:comunica:default:source-watch/actors#polling",
+      "@type": "ActorSourceWatchPolling",
       "mediatorHttp": { "@id": "urn:comunica:default:http/mediators#main" },
-      "defaultPollingFrequency": 10,
+      "defaultPollingPeriod": 10,
       "priority": 5
     },
     {
-      "@id": "urn:comunica:default:resource-watch/actors#solid-notification-websockets",
-      "@type": "ActorResourceWatchSolidNotificationWebsockets",
+      "@id": "urn:comunica:default:source-watch/actors#solid-notification-websockets",
+      "@type": "ActorSourceWatchSolidNotificationWebsockets",
       "mediatorHttp": { "@id": "urn:comunica:default:http/mediators#main" },
       "priority": 10
     },
     {
-      "@id": "urn:comunica:default:resource-watch/actors#deferred",
-      "@type": "ActorResourceWatchDeferred",
+      "@id": "urn:comunica:default:source-watch/actors#deferred",
+      "@type": "ActorSourceWatchDeferred",
       "mediatorHttp": { "@id": "urn:comunica:default:http/mediators#main" },
       "priority": 15
     }

engines/config-query-sparql-incremental/config/resource-watch/mediators.json → engines/config-query-sparql-incremental/config/source-watch/mediators.json

@@ -1,12 +1,12 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/bus-resource-watch/^1.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/bus-source-watch/^1.0.0/components/context.jsonld",
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/mediator-number/^4.0.0/components/context.jsonld"
   ],
-  "@id": "urn:comunica:default:resource-watch/mediators#main",
+  "@id": "urn:comunica:default:source-watch/mediators#main",
   "@type": "MediatorNumber",
   "type": "max",
   "field": "priority",
   "ignoreFailures": true,
-  "bus": { "@id": "ActorResourceWatch:_default_bus" }
+  "bus": { "@id": "ActorSourceWatch:_default_bus" }
 }

engines/query-sparql-incremental/package.json

@@ -267,7 +267,7 @@
     "@incremunica/actor-bindings-aggregator-factory-sum": "^1.3.0",
     "@incremunica/actor-bindings-aggregator-factory-wildcard-count": "^1.3.0",
     "@incremunica/actor-context-preprocess-query-source-convert-streams": "^1.3.0",
-    "@incremunica/actor-guard-naive": "^1.3.0",
+    "@incremunica/actor-determine-changes-naive": "^1.3.0",
     "@incremunica/actor-merge-bindings-context-is-addition": "^1.3.0",
     "@incremunica/actor-query-operation-group": "^1.3.0",
     "@incremunica/actor-query-operation-incremental-distinct-hash": "^1.3.0",
@@ -277,10 +277,10 @@
     "@incremunica/actor-rdf-join-incremental-minus-hash": "^1.3.0",
     "@incremunica/actor-rdf-join-incremental-optional-hash": "^1.3.0",
     "@incremunica/actor-rdf-join-inner-incremental-full-hash": "^1.3.0",
-    "@incremunica/actor-rdf-metadata-extract-guard-data": "^1.3.0",
-    "@incremunica/actor-resource-watch-deferred": "^1.3.0",
-    "@incremunica/actor-resource-watch-polling": "^1.3.0",
-    "@incremunica/actor-resource-watch-solid-notification-websockets": "^1.3.0",
+    "@incremunica/actor-rdf-metadata-extract-determine-changes-data": "^1.3.0",
+    "@incremunica/actor-source-watch-deferred": "^1.3.0",
+    "@incremunica/actor-source-watch-polling": "^1.3.0",
+    "@incremunica/actor-source-watch-solid-notification-websockets": "^1.3.0",
     "@incremunica/config-query-sparql-incremental": "^1.3.0"
   },
   "browser": {

engines/query-sparql-incremental/test-browser/QuerySparql-test.ts

@@ -57,7 +57,7 @@ describe('System test: QuerySparql (without polly)', () => {
           ?s ?p ?o.
           }`, {
         sources: [ streamingStore ],
-        pollingFrequency: 500,
+        pollingPeriod: 500,
       });
 
       expect(await partialArrayifyStream(bindingStream, 2)).toBeIsomorphicBindingsArray([
@@ -105,7 +105,7 @@ describe('System test: QuerySparql (without polly)', () => {
           ?o1 ?p2 ?o2.
           }`, {
         sources: [ streamingStore ],
-        pollingFrequency: 500,
+        pollingPeriod: 500,
       });
 
       expect(await partialArrayifyStream(bindingStream, 1)).toBeIsomorphicBindingsArray([
@@ -167,7 +167,7 @@ describe('System test: QuerySparql (with polly)', () => {
     ?s ?p ?o.
   }`, {
         sources: [ 'https://www.rubensworks.net/' ],
-        pollingFrequency: 500,
+        pollingPeriod: 500,
       });
 
       expect(await partialArrayifyStream(bindingStream, 100)).toHaveLength(100);
@@ -179,7 +179,7 @@ describe('System test: QuerySparql (with polly)', () => {
      }`;
       const context: QueryStringContext = {
         sources: [ 'https://www.rubensworks.net/' ],
-        pollingFrequency: 500,
+        pollingPeriod: 500,
       };
 
       bindingStream = await engine.queryBindings(query, context);
@@ -207,7 +207,7 @@ describe('System test: QuerySparql (with polly)', () => {
      }`;
       const context: QueryStringContext = {
         sources: [ 'https://www.rubensworks.net/' ],
-        pollingFrequency: 500,
+        pollingPeriod: 500,
       };
 
       bindingStream = await engine.queryBindings(query, context);
@@ -225,7 +225,7 @@ describe('System test: QuerySparql (with polly)', () => {
         ?s ?p ?s.
         }`, {
           sources: [ 'https://www.rubensworks.net/' ],
-          pollingFrequency: 500,
+          pollingPeriod: 500,
         });
 
         expect(await partialArrayifyStream(bindingStream, 1)).toHaveLength(1);
@@ -239,7 +239,7 @@ describe('System test: QuerySparql (with polly)', () => {
         ?v0 <http://xmlns.com/foaf/0.1/name> ?name.
         }`, {
           sources: [ 'https://www.rubensworks.net/' ],
-          pollingFrequency: 500,
+          pollingPeriod: 500,
         });
 
         expect(await partialArrayifyStream(bindingStream, 20)).toHaveLength(20);
@@ -251,7 +251,7 @@ describe('System test: QuerySparql (with polly)', () => {
         ?v0 <http://xmlns.com/foaf/0.1/name> ?name.
         }`, {
           sources: [ 'https://www.rubensworks.net/' ],
-          pollingFrequency: 1000,
+          pollingPeriod: 1000,
         });
 
         expect(await partialArrayifyStream(bindingStream, 20)).toHaveLength(20);
@@ -266,7 +266,7 @@ describe('System test: QuerySparql (with polly)', () => {
               'https://raw.githubusercontent.com/w3c/data-shapes/gh-pages/shacl-compact-syntax/' +
               'tests/valid/basic-shape-iri.shaclc',
             ],
-            pollingFrequency: 1000,
+            pollingPeriod: 1000,
           });
 
           expect(await partialArrayifyStream(bindingStream, 1)).toHaveLength(1);

engines/query-sparql-incremental/test/QuerySparql-test.ts

@@ -321,7 +321,7 @@ describe('System test: QuerySparql (without polly)', () => {
           ?s ?p ?o.
           }`, {
         sources: [ 'http://localhost:8787' ],
-        pollingFrequency: 1000,
+        pollingPeriod: 1000,
       });
 
       await expect(new Promise<Bindings>(resolve => bindingStream.once('data', (bindings) => {
@@ -344,7 +344,7 @@ describe('System test: QuerySparql (without polly)', () => {
         sources: [
           'http://localhost:8787',
         ],
-        pollingFrequency: 100,
+        pollingPeriod: 100,
         deferredEvaluationEventEmitter: deferredEventEmitter,
       });
 
@@ -396,7 +396,7 @@ describe('System test: QuerySparql (without polly)', () => {
   }`, {
         // @ts-expect-error
         sources: [ sourcesStream ],
-        pollingFrequency: 1000,
+        pollingPeriod: 1000,
       });
 
       await expect(new Promise<Bindings>(resolve => bindingStream.once('data', (bindings) => {
@@ -467,7 +467,7 @@ describe('System test: QuerySparql (without polly)', () => {
           ?s ?p ?o.
           }`, {
         sources: [ 'http://localhost:8787' ],
-        pollingFrequency: 1000,
+        pollingPeriod: 1000,
       });
 
       await expect(new Promise<Bindings>(resolve => bindingStream.once('data', (bindings) => {
@@ -498,7 +498,7 @@ describe('System test: QuerySparql (without polly)', () => {
            OPTIONAL { ?s2 <http://localhost:8787/p2> ?o2 . }
            }`, {
         sources: [ 'http://localhost:8787' ],
-        pollingFrequency: 1000,
+        pollingPeriod: 1000,
       });
 
       await expect(new Promise<Bindings>(resolve => bindingStream.once('data', (bindings) => {
@@ -550,7 +550,7 @@ describe('System test: QuerySparql (with polly)', () => {
     ?s ?p ?o.
   }`, {
         sources: [ 'https://www.rubensworks.net/' ],
-        pollingFrequency: 1000,
+        pollingPeriod: 1000,
       });
 
       await expect((partialArrayifyStream(bindingStream, 100))).resolves.toHaveLength(100);
@@ -567,7 +567,7 @@ describe('System test: QuerySparql (with polly)', () => {
             isAddition: true,
           },
         ]) ],
-        pollingFrequency: 1000,
+        pollingPeriod: 1000,
       });
 
       await expect((partialArrayifyStream(bindingStream, 100))).resolves.toHaveLength(100);
@@ -578,7 +578,7 @@ describe('System test: QuerySparql (with polly)', () => {
      ?s ?p ?o.
      }`;
       const context: QueryStringContext = {
-        pollingFrequency: 1000,
+        pollingPeriod: 1000,
         sources: [ 'https://www.rubensworks.net/' ],
       };
 
@@ -595,7 +595,7 @@ describe('System test: QuerySparql (with polly)', () => {
      }`;
       const context: QueryStringContext = {
         sources: [ 'https://www.rubensworks.net/' ],
-        pollingFrequency: 1000,
+        pollingPeriod: 1000,
       };
 
       bindingStream = await engine.queryBindings(query, context);
@@ -615,7 +615,7 @@ describe('System test: QuerySparql (with polly)', () => {
         ?s ?p ?s.
         }`, {
           sources: [ 'https://www.rubensworks.net/' ],
-          pollingFrequency: 1000,
+          pollingPeriod: 1000,
         });
 
         await expect((partialArrayifyStream(bindingStream, 1))).resolves.toHaveLength(1);
@@ -629,7 +629,7 @@ describe('System test: QuerySparql (with polly)', () => {
         ?v0 <http://xmlns.com/foaf/0.1/name> ?name.
         }`, {
           sources: [ 'https://www.rubensworks.net/' ],
-          pollingFrequency: 1000,
+          pollingPeriod: 1000,
         });
 
         await expect((partialArrayifyStream(bindingStream, 20))).resolves.toHaveLength(20);
@@ -641,7 +641,7 @@ describe('System test: QuerySparql (with polly)', () => {
         ?v0 <http://xmlns.com/foaf/0.1/name> ?name.
         }`, {
           sources: [ 'https://www.rubensworks.net/' ],
-          pollingFrequency: 1000,
+          pollingPeriod: 1000,
         });
 
         await expect((partialArrayifyStream(bindingStream, 20))).resolves.toHaveLength(20);
@@ -656,7 +656,7 @@ describe('System test: QuerySparql (with polly)', () => {
               'https://raw.githubusercontent.com/w3c/data-shapes/gh-pages/shacl-compact-syntax/' +
               'tests/valid/basic-shape-iri.shaclc',
             ],
-            pollingFrequency: 1000,
+            pollingPeriod: 1000,
           });
 
           await expect((partialArrayifyStream(bindingStream, 1))).resolves.toHaveLength(1);

packages/actor-determine-changes-naive/README.md

@@ -0,0 +1,30 @@
+# Incremunica Naive Determine Changes Actor
+
+[![npm version](https://badge.fury.io/js/@incremunica%2Factor-determine-changes-naive.svg)](https://badge.fury.io/js/@incremunica%2Factor-determine-changes-naive)
+
+An incremunica Naive Determine Changes Actor.
+
+## Install
+
+```bash
+$ yarn add @incremunica/actor-determine-changes-naive
+```
+
+## Configure
+
+After installing, this package can be added to your engine's configuration as follows:
+```text
+{
+  "@context": [
+    ...
+    "https://linkedsoftwaredependencies.org/bundles/npm/@incremunica/actor-determine-changes-naive/^1.0.0/components/context.jsonld"
+  ],
+  "actors": [
+    ...
+    {
+      "@id": "urn:comunica:default:determine-changes/actors#naive",
+      "@type": "ActorDetermineChangesNaive"
+    }
+  ]
+}
+```