@startinblox/core 0.19.6-beta.2 → 0.19.7-beta.1

package/dist/{helpers-4tVqSOBU.js → helpers-1iYMzEUk.js}

@@ -1518,6 +1518,8 @@ const compare = {
     return (range[0] == null || range[0] === "" || subject >= range[0]) && (range[1] == null || range[1] === "" || subject <= range[1]);
   },
   resource(subject, query) {
+    if (!subject || !subject["@id"])
+      return false;
     if (query === "")
       return true;
     if (!query["@id"])

package/dist/helpers.js

@@ -1,4 +1,4 @@
-import { A, m, n, c, A as A2, d, k, e, a, f, g, i, j, l, p, s, b, t, u } from "./helpers-4tVqSOBU.js";
+import { A, m, n, c, A as A2, d, k, e, a, f, g, i, j, l, p, s, b, t, u } from "./helpers-1iYMzEUk.js";
 export {
   A as AsyncIterableBuilder,
   m as asyncQuerySelector,

package/dist/index.js

@@ -1,5 +1,5 @@
-import { d as defineComponent, u as uniqID, i as importInlineCSS, f as fuzzyCompare, p as parseFieldsString, a as findClosingBracketMatchIndex, c as compare, e as evalTemplateString, s as setDeepProperty, t as transformArrayToContainer } from "./helpers-4tVqSOBU.js";
-import { h } from "./helpers-4tVqSOBU.js";
+import { d as defineComponent, u as uniqID, i as importInlineCSS, f as fuzzyCompare, p as parseFieldsString, a as findClosingBracketMatchIndex, c as compare, e as evalTemplateString, s as setDeepProperty, t as transformArrayToContainer } from "./helpers-1iYMzEUk.js";
+import { h } from "./helpers-1iYMzEUk.js";
 import PubSub$1 from "https://cdn.skypack.dev/pubsub-js";
 import L from "https://cdn.skypack.dev/leaflet";
 import "https://cdn.skypack.dev/leaflet.markercluster";
@@ -11000,6 +11000,8 @@ class CustomGetter {
         return value ? value : void 0;
       }
     } catch (e) {
+      if (!path.split)
+        return void 0;
       const path1 = path.split(".");
       const path2 = [];
       let value;
@@ -11007,11 +11009,7 @@ class CustomGetter {
         await this.getResource(this.resourceId, { ...this.clientContext, ...this.serverContext }, this.parentId);
       }
       while (true) {
-        try {
-          value = this.resource[this.getExpandedPredicate(path1[0])];
-        } catch (e2) {
-          break;
-        }
+        value = await this.resource[this.getExpandedPredicate(path1[0])];
         if (path1.length <= 1)
           break;
         const lastPath1El = path1.pop();
@@ -11023,7 +11021,7 @@ class CustomGetter {
           return this.getLiteralValue(value);
         return await this.getResource(value["@id"], { ...this.clientContext, ...this.serverContext }, this.parentId || this.resourceId);
       }
-      if (!value)
+      if (!value || !value["@id"])
         return void 0;
       let resource = await this.getResource(value["@id"], { ...this.clientContext, ...this.serverContext }, this.parentId || this.resourceId);
       store.subscribeResourceTo(this.resourceId, value["@id"]);
@@ -51700,6 +51698,15 @@ const matchValue = async (val, query, throwOn) => {
         return orThrow(throwOn, true);
     }
     return orThrow(throwOn, await ret);
+  } else if (Array.isArray(subject)) {
+    let ret = Promise.resolve(query.value === "");
+    for (const value of subject) {
+      ret = await ret || await matchValue(value, query);
+      if (ret) {
+        return true;
+      }
+    }
+    return orThrow(throwOn, await ret);
   }
   return orThrow(throwOn, compare[query.type](subject, query.value));
 };
@@ -51711,6 +51718,47 @@ const cacheFieldsProps = (cacheKey, filter, fields, searchForm) => {
     };
   }
 };
+const traversePath = async (resource, path, targetedType) => {
+  var _a, _b;
+  let result = [];
+  let currentRes;
+  let remainingPath = path;
+  if (!path.length)
+    return [];
+  try {
+    currentRes = await resource[path[0]];
+    const lastPath1El = path.shift();
+    if (lastPath1El)
+      remainingPath = path;
+    if (currentRes && ((_a = currentRes.isContainer) == null ? void 0 : _a.call(currentRes)) && remainingPath.length > 1) {
+      result = await traversePath(currentRes, remainingPath, targetedType);
+    } else if (currentRes && Array.isArray(currentRes)) {
+      for (const res of currentRes) {
+        if (remainingPath.length > 1) {
+          result = await traversePath(res, remainingPath, targetedType);
+        } else {
+          let targetsRes = await res[remainingPath[0]];
+          if (!targetsRes)
+            return [];
+          if ((_b = targetsRes.isContainer) == null ? void 0 : _b.call(targetsRes)) {
+            targetsRes = targetsRes["ldp:contains"];
+          }
+          if (!Array.isArray(targetsRes))
+            targetsRes = [targetsRes];
+          for (const targetRes of targetsRes) {
+            if (!result.some((item2) => item2["@id"] === targetRes["@id"])) {
+              result.push({ "@id": targetRes["@id"] });
+            }
+          }
+        }
+      }
+    }
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
+  return result;
+};
 const matchFilter = async (resource, filter, query, fieldsAttr, searchForm, filterId, throwOn) => {
   let fields = null;
   const cacheKey = `${filter}_${filterId}`;
@@ -51720,6 +51768,16 @@ const matchFilter = async (resource, filter, query, fieldsAttr, searchForm, filt
   } else if (window.cachePropsSearchFilter[cacheKey].setSearchFields !== null) {
     fields = window.cachePropsSearchFilter[cacheKey].setSearchFields;
   } else {
+    if (!await resource[filter] && filter.includes("ldp:contains")) {
+      const path1 = filter.split(".");
+      const targetedType = path1[path1.length - 1];
+      let targetIds = [];
+      targetIds = await traversePath(resource, path1, targetedType);
+      if (!Array.isArray(targetIds) || targetIds.length === 0 && query.value !== "") {
+        throw throwOn ? false : true;
+      }
+      return await matchValue(targetIds, query, throwOn);
+    }
     return matchValue(resource[filter], query, throwOn);
   }
   try {
@@ -51742,8 +51800,8 @@ const matchFilter = async (resource, filter, query, fieldsAttr, searchForm, filt
 };
 const matchFilters = async (resource, filters, filterNames, fields, searchForm, filterId) => {
   try {
-    await Promise.all(filterNames.map(
-      (filter) => matchFilter(
+    await Promise.all(filterNames.map(async (filter) => {
+      let match3 = await matchFilter(
         resource,
         filter,
         filters[filter],
@@ -51752,8 +51810,9 @@ const matchFilters = async (resource, filters, filterNames, fields, searchForm,
         filterId,
         false
         // stop searching when 1 filter is false (= AND)
-      )
-    ));
+      );
+      return match3;
+    }));
   } catch (e) {
     return false;
   }
@@ -51763,16 +51822,17 @@ const searchInResources = async (resources, filters, fields, searchForm) => {
   const filterNames = Object.keys(filters);
   const filterId = uniqID();
   window.cachePropsSearchFilter = {};
-  return Promise.all(resources.map(
-    (resource) => matchFilters(
+  return Promise.all(resources.map(async (resource) => {
+    let match3 = await matchFilters(
       resource,
       filters,
       filterNames,
       fields,
       searchForm,
       filterId
-    )
-  ));
+    );
+    return match3;
+  }));
 };
 const FilterMixin = {
   name: "filter-mixin",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startinblox/core",
-  "version": "0.19.6-beta.2",
+  "version": "0.19.7-beta.1",
   "description": "This is a series of web component respecting both the web components standards and the Linked Data Platform convention.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",