@openhps/rdf 0.1.8 → 0.1.9

package/dist/web/openhps-rdf.sparql.es.js

@@ -34,6 +34,7 @@ const xsd = {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "SPARQLDataDriver": () => (/* reexport safe */ _service__WEBPACK_IMPORTED_MODULE_0__.SPARQLDataDriver),
+/* harmony export */   "SPARQLDriverBase": () => (/* reexport safe */ _service__WEBPACK_IMPORTED_MODULE_0__.SPARQLDriverBase),
 /* harmony export */   "SPARQLGenerator": () => (/* reexport safe */ _service__WEBPACK_IMPORTED_MODULE_0__.SPARQLGenerator)
 /* harmony export */ });
 /* harmony import */ var _service__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./service */ "./dist/esm/service/index.js");
@@ -756,29 +757,21 @@ function isObject(item) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "SPARQLDataDriver": () => (/* binding */ SPARQLDataDriver)
 /* harmony export */ });
-/* harmony import */ var _openhps_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @openhps/core */ "@openhps/core");
-/* harmony import */ var n3__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! n3 */ "./node_modules/n3/src/N3Store.js");
-/* harmony import */ var n3__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! n3 */ "./node_modules/n3/src/N3DataFactory.js");
-/* harmony import */ var _rdf__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../rdf */ "./dist/esm/rdf/RDFSerializer.js");
-/* harmony import */ var sparql_http_client__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! sparql-http-client */ "./node_modules/sparql-http-client/index.js");
-/* harmony import */ var sparql_http_client__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(sparql_http_client__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _vocab__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../vocab */ "./dist/esm/vocab/index.js");
-/* harmony import */ var _SPARQLGenerator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./SPARQLGenerator */ "./dist/esm/service/SPARQLGenerator.js");
-
-
+/* harmony import */ var n3__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! n3 */ "./node_modules/n3/src/N3Store.js");
+/* harmony import */ var sparql_http_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! sparql-http-client */ "./node_modules/sparql-http-client/index.js");
+/* harmony import */ var sparql_http_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sparql_http_client__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _SPARQLDriverBase__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./SPARQLDriverBase */ "./dist/esm/service/SPARQLDriverBase.js");
 
 
 
-
-class SPARQLDataDriver extends _openhps_core__WEBPACK_IMPORTED_MODULE_0__.DataServiceDriver {
+class SPARQLDataDriver extends _SPARQLDriverBase__WEBPACK_IMPORTED_MODULE_1__.SPARQLDriverBase {
     constructor(dataType, options) {
         super(dataType, options);
-        this.generator = new _SPARQLGenerator__WEBPACK_IMPORTED_MODULE_2__.SPARQLGenerator(this.dataType, this.options.baseUri);
         this.once('build', this._onBuild.bind(this));
     }
     _onBuild() {
         return new Promise((resolve) => {
-            this.client = new (sparql_http_client__WEBPACK_IMPORTED_MODULE_1___default())({
+            this.client = new (sparql_http_client__WEBPACK_IMPORTED_MODULE_0___default())({
                 endpointUrl: this.options.endpointUrl,
                 storeUrl: this.options.storeUrl,
                 updateUrl: this.options.updateUrl,
@@ -788,9 +781,89 @@ class SPARQLDataDriver extends _openhps_core__WEBPACK_IMPORTED_MODULE_0__.DataSe
             resolve();
         });
     }
+    findAllSerialized(query) {
+        return new Promise((resolve, reject) => {
+            this.client.query
+                .construct(this.generator.createFindAll(query))
+                .then((stream) => {
+                const store = new n3__WEBPACK_IMPORTED_MODULE_2__["default"]();
+                stream.on('data', (row) => {
+                    store.addQuad(row);
+                });
+                stream.on('end', () => {
+                    resolve(store);
+                });
+            })
+                .catch(reject);
+        });
+    }
+    insert(_, object) {
+        return new Promise((resolve, reject) => {
+            this.client.query
+                .update(this.generator.createInsert(object), {
+                headers: this.options.headers,
+                operation: this.options.operation,
+            })
+                .then(() => {
+                resolve(object);
+            })
+                .catch(reject);
+        });
+    }
+    delete(id) {
+        return new Promise((resolve, reject) => {
+            this.client.query
+                .update(this.generator.createDelete(id), {
+                headers: this.options.headers,
+                operation: this.options.operation,
+            })
+                .then(resolve)
+                .catch(reject);
+        });
+    }
+    deleteAll(query) {
+        return new Promise((resolve, reject) => {
+            this.client.query
+                .update(this.generator.createDeleteAll(query), {
+                headers: this.options.headers,
+                operation: this.options.operation,
+            })
+                .then(resolve)
+                .catch(reject);
+        });
+    }
+}
+//# sourceMappingURL=SPARQLDataDriver.js.map
+
+/***/ }),
+
+/***/ "./dist/esm/service/SPARQLDriverBase.js":
+/*!**********************************************!*\
+  !*** ./dist/esm/service/SPARQLDriverBase.js ***!
+  \**********************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "SPARQLDriverBase": () => (/* binding */ SPARQLDriverBase)
+/* harmony export */ });
+/* harmony import */ var _openhps_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @openhps/core */ "@openhps/core");
+/* harmony import */ var n3__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! n3 */ "./node_modules/n3/src/N3DataFactory.js");
+/* harmony import */ var _rdf__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../rdf */ "./dist/esm/rdf/RDFSerializer.js");
+/* harmony import */ var _vocab__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../vocab */ "./dist/esm/vocab/index.js");
+/* harmony import */ var _SPARQLGenerator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./SPARQLGenerator */ "./dist/esm/service/SPARQLGenerator.js");
+
+
+
+
+
+class SPARQLDriverBase extends _openhps_core__WEBPACK_IMPORTED_MODULE_0__.DataServiceDriver {
+    constructor(dataType, options) {
+        super(dataType, options);
+        this.generator = new _SPARQLGenerator__WEBPACK_IMPORTED_MODULE_1__.SPARQLGenerator(this.dataType, this.options.baseUri);
+    }
     findByUID(id) {
         return new Promise((resolve, reject) => {
-            const identifierMember = _rdf__WEBPACK_IMPORTED_MODULE_3__.RDFSerializer.getUriMetadata(this.dataType);
+            const identifierMember = _rdf__WEBPACK_IMPORTED_MODULE_2__.RDFSerializer.getUriMetadata(this.dataType);
             this.findOne({
                 [identifierMember.key]: id,
             })
@@ -810,22 +883,6 @@ class SPARQLDataDriver extends _openhps_core__WEBPACK_IMPORTED_MODULE_0__.DataSe
                 .catch(reject);
         });
     }
-    findAllSerialized(query) {
-        return new Promise((resolve, reject) => {
-            this.client.query
-                .construct(this.generator.createFindAll(query))
-                .then((stream) => {
-                const store = new n3__WEBPACK_IMPORTED_MODULE_4__["default"]();
-                stream.on('data', (row) => {
-                    store.addQuad(row);
-                });
-                stream.on('end', () => {
-                    resolve(store);
-                });
-            })
-                .catch(reject);
-        });
-    }
     findAll(query, options = {}) {
         return new Promise((resolve, reject) => {
             this.findAllSerialized(query)
@@ -834,9 +891,11 @@ class SPARQLDataDriver extends _openhps_core__WEBPACK_IMPORTED_MODULE_0__.DataSe
                     return resolve([]);
                 }
                 const subjects = store
-                    .getSubjects(n3__WEBPACK_IMPORTED_MODULE_5__["default"].namedNode(_vocab__WEBPACK_IMPORTED_MODULE_6__.rdf.type), null, null)
+                    .getSubjects(n3__WEBPACK_IMPORTED_MODULE_3__["default"].namedNode(_vocab__WEBPACK_IMPORTED_MODULE_4__.rdf.type), null, null)
                     .filter((subject) => subject.termType === 'NamedNode');
-                let data = subjects.map((subject) => _rdf__WEBPACK_IMPORTED_MODULE_3__.RDFSerializer.deserializeFromStore(subject, store));
+                let data = subjects
+                    .map((subject) => _rdf__WEBPACK_IMPORTED_MODULE_2__.RDFSerializer.deserializeFromStore(subject, store))
+                    .filter((data) => data.constructor.name === this.dataType.name);
                 if (options.sort) {
                     data = data
                         .sort((a, b) => options.sort
@@ -869,50 +928,15 @@ class SPARQLDataDriver extends _openhps_core__WEBPACK_IMPORTED_MODULE_0__.DataSe
                     return resolve(0);
                 }
                 const subjects = store
-                    .getSubjects(n3__WEBPACK_IMPORTED_MODULE_5__["default"].namedNode(_vocab__WEBPACK_IMPORTED_MODULE_6__.rdf.type), null, null)
+                    .getSubjects(n3__WEBPACK_IMPORTED_MODULE_3__["default"].namedNode(_vocab__WEBPACK_IMPORTED_MODULE_4__.rdf.type), null, null)
                     .filter((subject) => subject.termType === 'NamedNode');
                 resolve(subjects.length);
             })
                 .catch(reject);
         });
     }
-    insert(_, object) {
-        return new Promise((resolve, reject) => {
-            this.client.query
-                .update(this.generator.createInsert(object), {
-                headers: this.options.headers,
-                operation: this.options.operation,
-            })
-                .then(() => {
-                resolve(object);
-            })
-                .catch(reject);
-        });
-    }
-    delete(id) {
-        return new Promise((resolve, reject) => {
-            this.client.query
-                .update(this.generator.createDelete(id), {
-                headers: this.options.headers,
-                operation: this.options.operation,
-            })
-                .then(resolve)
-                .catch(reject);
-        });
-    }
-    deleteAll(query) {
-        return new Promise((resolve, reject) => {
-            this.client.query
-                .update(this.generator.createDeleteAll(query), {
-                headers: this.options.headers,
-                operation: this.options.operation,
-            })
-                .then(resolve)
-                .catch(reject);
-        });
-    }
 }
-//# sourceMappingURL=SPARQLDataDriver.js.map
+//# sourceMappingURL=SPARQLDriverBase.js.map
 
 /***/ }),
 
@@ -1372,7 +1396,21 @@ class SPARQLGenerator {
             case '$nin':
                 break;
             case '$elemMatch':
-                patterns.push(...this.createQuery(subquery[selector], dataType));
+                patterns.push({
+                    type: 'group',
+                    patterns: [
+                        {
+                            type: 'bgp',
+                            triples: [
+                                {
+                                    subject: n3__WEBPACK_IMPORTED_MODULE_3__["default"].variable('subject'),
+                                    predicate: n3__WEBPACK_IMPORTED_MODULE_3__["default"].namedNode(predicate),
+                                    object: n3__WEBPACK_IMPORTED_MODULE_3__["default"].namedNode(this.baseUri + 'dataobject_mvdewync'),
+                                },
+                            ],
+                        },
+                    ],
+                });
                 break;
         }
         return patterns;
@@ -1399,10 +1437,13 @@ class SPARQLGenerator {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "SPARQLDataDriver": () => (/* reexport safe */ _SPARQLDataDriver__WEBPACK_IMPORTED_MODULE_0__.SPARQLDataDriver),
+/* harmony export */   "SPARQLDriverBase": () => (/* reexport safe */ _SPARQLDriverBase__WEBPACK_IMPORTED_MODULE_2__.SPARQLDriverBase),
 /* harmony export */   "SPARQLGenerator": () => (/* reexport safe */ _SPARQLGenerator__WEBPACK_IMPORTED_MODULE_1__.SPARQLGenerator)
 /* harmony export */ });
 /* harmony import */ var _SPARQLDataDriver__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./SPARQLDataDriver */ "./dist/esm/service/SPARQLDataDriver.js");
 /* harmony import */ var _SPARQLGenerator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./SPARQLGenerator */ "./dist/esm/service/SPARQLGenerator.js");
+/* harmony import */ var _SPARQLDriverBase__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./SPARQLDriverBase */ "./dist/esm/service/SPARQLDriverBase.js");
+
 
 
 //# sourceMappingURL=index.js.map
@@ -35570,8 +35611,9 @@ module.exports = x({ ["DataSerializer"]: () => __WEBPACK_EXTERNAL_MODULE__openhp
 /******/ // Load entry module and return exports
 /******/ var __webpack_exports__ = __webpack_require__(__webpack_require__.s = "./dist/esm/index.sparql.js");
 /******/ var __webpack_exports__SPARQLDataDriver = __webpack_exports__.SPARQLDataDriver;
+/******/ var __webpack_exports__SPARQLDriverBase = __webpack_exports__.SPARQLDriverBase;
 /******/ var __webpack_exports__SPARQLGenerator = __webpack_exports__.SPARQLGenerator;
-/******/ export { __webpack_exports__SPARQLDataDriver as SPARQLDataDriver, __webpack_exports__SPARQLGenerator as SPARQLGenerator };
+/******/ export { __webpack_exports__SPARQLDataDriver as SPARQLDataDriver, __webpack_exports__SPARQLDriverBase as SPARQLDriverBase, __webpack_exports__SPARQLGenerator as SPARQLGenerator };
 /******/ 
 
 //# sourceMappingURL=openhps-rdf.sparql.es.js.map