@startinblox/core 2.0.0-beta.7 → 2.0.0-beta.9

package/dist/index.js

@@ -2,8 +2,8 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var _a2;
-import { d as defineComponent, u as uniqID, e as evalTemplateString, c as compare, p as parseFieldsString, f as findClosingBracketMatchIndex, g as generalComparator, a as fuzzyCompare, b as asyncQuerySelector, i as importInlineCSS, h as importCSS, t as transformArrayToContainer, s as setDeepProperty } from "./helpers-Ae979zFb.js";
-import { j } from "./helpers-Ae979zFb.js";
+import { d as defineComponent, a as doesResourceContainList, u as uniqID, e as evalTemplateString, c as compare, p as parseFieldsString, f as findClosingBracketMatchIndex, g as generalComparator, b as fuzzyCompare, h as asyncQuerySelector, i as importInlineCSS, j as importCSS, t as transformArrayToContainer, s as setDeepProperty } from "./helpers-DH22C8s9.js";
+import { k } from "./helpers-DH22C8s9.js";
 if (!("flat" in Array.prototype)) {
   Object.defineProperty(Array.prototype, "flat", {
     configurable: true,
@@ -56,12 +56,12 @@ function getAugmentedNamespace(n3) {
     a2.prototype = f2.prototype;
   } else a2 = {};
   Object.defineProperty(a2, "__esModule", { value: true });
-  Object.keys(n3).forEach(function(k2) {
-    var d2 = Object.getOwnPropertyDescriptor(n3, k2);
-    Object.defineProperty(a2, k2, d2.get ? d2 : {
+  Object.keys(n3).forEach(function(k3) {
+    var d2 = Object.getOwnPropertyDescriptor(n3, k3);
+    Object.defineProperty(a2, k3, d2.get ? d2 : {
       enumerable: true,
       get: function() {
-        return n3[k2];
+        return n3[k3];
       }
     });
   });
@@ -758,14 +758,14 @@ function requireRelativeToAbsoluteIri() {
   if (hasRequiredRelativeToAbsoluteIri) return relativeToAbsoluteIri;
   hasRequiredRelativeToAbsoluteIri = 1;
   (function(exports2) {
-    var __createBinding = relativeToAbsoluteIri && relativeToAbsoluteIri.__createBinding || (Object.create ? function(o2, m2, k2, k22) {
-      if (k22 === void 0) k22 = k2;
+    var __createBinding = relativeToAbsoluteIri && relativeToAbsoluteIri.__createBinding || (Object.create ? function(o2, m2, k3, k22) {
+      if (k22 === void 0) k22 = k3;
       Object.defineProperty(o2, k22, { enumerable: true, get: function() {
-        return m2[k2];
+        return m2[k3];
       } });
-    } : function(o2, m2, k2, k22) {
-      if (k22 === void 0) k22 = k2;
-      o2[k22] = m2[k2];
+    } : function(o2, m2, k3, k22) {
+      if (k22 === void 0) k22 = k3;
+      o2[k22] = m2[k3];
     });
     var __exportStar = relativeToAbsoluteIri && relativeToAbsoluteIri.__exportStar || function(m2, exports3) {
       for (var p2 in m2) if (p2 !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p2)) __createBinding(exports3, m2, p2);
@@ -2578,25 +2578,25 @@ function requirePermuter() {
     next() {
       const { current, dir } = this;
       const rval = current.slice();
-      let k2 = null;
+      let k3 = null;
       let pos = 0;
       const length = current.length;
       for (let i3 = 0; i3 < length; ++i3) {
         const element = current[i3];
         const left = dir.get(element);
-        if ((k2 === null || element > k2) && (left && i3 > 0 && element > current[i3 - 1] || !left && i3 < length - 1 && element > current[i3 + 1])) {
-          k2 = element;
+        if ((k3 === null || element > k3) && (left && i3 > 0 && element > current[i3 - 1] || !left && i3 < length - 1 && element > current[i3 + 1])) {
+          k3 = element;
           pos = i3;
         }
       }
-      if (k2 === null) {
+      if (k3 === null) {
         this.done = true;
       } else {
-        const swap = dir.get(k2) ? pos - 1 : pos + 1;
+        const swap = dir.get(k3) ? pos - 1 : pos + 1;
         current[pos] = current[swap];
-        current[swap] = k2;
+        current[swap] = k3;
         for (const element of current) {
-          if (element > k2) {
+          if (element > k3) {
             dir.set(element, !dir.get(element));
           }
         }
@@ -3911,8 +3911,8 @@ function requireUtil() {
         }
       } else if (value instanceof Map) {
         rval = /* @__PURE__ */ new Map();
-        for (const [k2, v2] of value) {
-          rval.set(k2, api.clone(v2));
+        for (const [k3, v2] of value) {
+          rval.set(k3, api.clone(v2));
         }
       } else if (value instanceof Set) {
         rval = /* @__PURE__ */ new Set();
@@ -4490,8 +4490,8 @@ function requireXhr() {
       req.onload = () => resolve(req);
       req.onerror = (err) => reject(err);
       req.open("GET", url2, true);
-      for (const k2 in headers) {
-        req.setRequestHeader(k2, headers[k2]);
+      for (const k3 in headers) {
+        req.setRequestHeader(k3, headers[k3]);
       }
       req.send();
     });
@@ -5009,10 +5009,10 @@ function requireLruCache() {
       }
     }
     keys() {
-      return this[LRU_LIST].toArray().map((k2) => k2.key);
+      return this[LRU_LIST].toArray().map((k3) => k3.key);
     }
     values() {
-      return this[LRU_LIST].toArray().map((k2) => k2.value);
+      return this[LRU_LIST].toArray().map((k3) => k3.value);
     }
     reset() {
       if (this[DISPOSE] && this[LRU_LIST] && this[LRU_LIST].length) {
@@ -5921,7 +5921,7 @@ function requireContext() {
     if (term === "@type" && _isObject(value) && (value["@container"] || "@set") === "@set" && api.processingMode(activeCtx, 1.1)) {
       const validKeys2 = ["@container", "@id", "@protected"];
       const keys2 = Object.keys(value);
-      if (keys2.length === 0 || keys2.some((k2) => !validKeys2.includes(k2))) {
+      if (keys2.length === 0 || keys2.some((k3) => !validKeys2.includes(k3))) {
         throw new JsonLdError(
           "Invalid JSON-LD syntax; keywords cannot be overridden.",
           "jsonld.SyntaxError",
@@ -7236,8 +7236,8 @@ function requireExpand() {
       }
       if (expandedProperty === "@type") {
         if (_isObject(value)) {
-          value = Object.fromEntries(Object.entries(value).map(([k2, v2]) => [
-            _expandIri(typeScopedContext, k2, { vocab: true }),
+          value = Object.fromEntries(Object.entries(value).map(([k3, v2]) => [
+            _expandIri(typeScopedContext, k3, { vocab: true }),
             _asArray(v2).map(
               (vv) => _expandIri(
                 typeScopedContext,
@@ -7583,7 +7583,7 @@ function requireExpand() {
     for (const key of nests) {
       const nestedValues = _isArray(element[key]) ? element[key] : [element[key]];
       for (const nv of nestedValues) {
-        if (!_isObject(nv) || Object.keys(nv).some((k2) => _expandIri(activeCtx, k2, { vocab: true }, options) === "@value")) {
+        if (!_isObject(nv) || Object.keys(nv).some((k3) => _expandIri(activeCtx, k3, { vocab: true }, options) === "@value")) {
           throw new JsonLdError(
             "Invalid JSON-LD syntax; nested value must be a node object.",
             "jsonld.SyntaxError",
@@ -10812,7 +10812,7 @@ class CustomGetter {
     // context given by the server
     __publicField(this, "parentId");
     // id of the parent resource, used to get the absolute url of the current resource
-    __publicField(this, "containerTypes");
+    __publicField(this, "listTypes");
     // types of resources interpreted as containers
     __publicField(this, "serverPagination");
     // pagination attributes to give to server
@@ -10824,8 +10824,9 @@ class CustomGetter {
     this.resourceId = resourceId;
     this.serverPagination = serverPagination;
     this.serverSearch = serverSearch;
-    this.containerTypes = [
+    this.listTypes = [
       this.getExpandedPredicate("ldp:Container"),
+      this.getExpandedPredicate("dcat:Catalog"),
       this.getExpandedPredicate("ldp:BasicContainer"),
       this.getExpandedPredicate("ldp:DirectContainer"),
       this.getExpandedPredicate("ldp:IndirectContainer"),
@@ -10845,8 +10846,9 @@ class CustomGetter {
       if (!isUrl.protocol.startsWith("http"))
         throw new Error("Not a valid HTTP url");
       if (isUrl) {
-        let resources = this.resource[this.getExpandedPredicate(path)];
-        if (!resources) return void 0;
+        let resources = this.getList(path);
+        if (!resources || Array.isArray(resources) && resources.length === 0)
+          return void 0;
         if (!Array.isArray(resources)) resources = [resources];
         const result = resources ? resources.map((res) => {
           let resource = store.get(res["@id"]);
@@ -10876,7 +10878,7 @@ class CustomGetter {
         );
       }
       while (true) {
-        value = await this.resource[this.getExpandedPredicate(path1[0])];
+        value = await this.getList(path1[0]);
         if (path1.length <= 1) break;
         const lastPath1El = path1.pop();
         if (lastPath1El) path2.unshift(lastPath1El);
@@ -10905,7 +10907,7 @@ class CustomGetter {
    * @returns
    */
   getLiteralValue(value) {
-    if (typeof value !== "object") return value;
+    if (typeof value !== "object" || value === null) return value;
     if (value["@value"]) return value["@value"];
     if (!Array.isArray(value)) return value;
     if (value.length === 0) return null;
@@ -10936,17 +10938,15 @@ class CustomGetter {
   isContainer() {
     if (this.resource["@type"]) {
       if (Array.isArray(this.resource["@type"]))
-        return this.containerTypes.some(
+        return this.listTypes.some(
           (type) => this.resource["@type"].includes(type)
         );
-      return this.containerTypes.includes(this.resource["@type"]);
+      return this.listTypes.includes(this.resource["@type"]);
     }
     if (!this.resource.type) return false;
     if (Array.isArray(this.resource.type))
-      return this.containerTypes.some(
-        (type) => this.resource.type.includes(type)
-      );
-    return this.containerTypes.includes(this.resource.type);
+      return this.listTypes.some((type) => this.resource.type.includes(type));
+    return this.listTypes.includes(this.resource.type);
   }
   /**
    * Return true if the given key in the current resource in an array
@@ -10966,14 +10966,18 @@ class CustomGetter {
   /**
    * Get children of container as objects
    */
-  getChildren(predicateName) {
-    return this.resource[this.getExpandedPredicate(predicateName)] || [];
+  getList(predicateName) {
+    let value = this.resource[predicateName];
+    if (!value) {
+      value = this.resource[this.getExpandedPredicate(predicateName)];
+    }
+    if (value === void 0 || value === null) {
+      return [];
+    }
+    return value;
   }
-  /**
-   * Get children of container as Proxys
-   */
-  getLdpContains() {
-    let children = this.resource[this.getExpandedPredicate("ldp:contains")];
+  getListAndCacheIt(predicate) {
+    let children = this.getList(predicate);
     if (!children) return null;
     if (!Array.isArray(children)) children = [children];
     const result = children ? children.map((res) => {
@@ -10991,6 +10995,15 @@ class CustomGetter {
     }) : [];
     return result;
   }
+  getDcatDataset() {
+    return this.getListAndCacheIt("dcat:dataset");
+  }
+  /**
+   * Get children of container as Proxys
+   */
+  getLdpContains() {
+    return this.getListAndCacheIt("ldp:contains");
+  }
   merge(resource) {
     this.resource = {
       ...this.getResourceData(),
@@ -11000,6 +11013,15 @@ class CustomGetter {
   getResourceData() {
     return this.resource;
   }
+  getContainerList() {
+    if (this.getType() === "ldp:Container") {
+      return this.getLdpContains();
+    }
+    if (this.getType() === "dcat:Catalog") {
+      return this.getDcatDataset();
+    }
+    return null;
+  }
   /**
    * return true resource seems complete
    * @param prop
@@ -11020,7 +11042,7 @@ class CustomGetter {
    * @returns
    */
   async getPermissions() {
-    let permissions = this.resource[this.getExpandedPredicate("permissions")];
+    let permissions = this.getList("permissions").map((p2) => String(p2));
     if (!permissions) {
       await this.getResource(
         this.resourceId,
@@ -11028,7 +11050,7 @@ class CustomGetter {
         this.parentId,
         true
       );
-      permissions = this.resource[this.getExpandedPredicate("permissions")];
+      permissions = this.getList("permissions").map((p2) => String(p2));
     }
     if (!Array.isArray(permissions)) permissions = [permissions];
     return permissions ? permissions : [];
@@ -11091,8 +11113,8 @@ class CustomGetter {
           // return synchronously
           case "properties":
             return this.getProperties();
-          case "ldp:contains":
-            return this.getLdpContains();
+          case "listPredicate":
+            return this.getContainerList();
           // returns standard arrays synchronously
           case "permissions":
             return this.getPermissions();
@@ -11126,6 +11148,7 @@ const base_context = {
   acl: "http://www.w3.org/ns/auth/acl#",
   hd: "http://cdn.startinblox.com/owl/ttl/vocab.ttl#",
   sib: "http://cdn.startinblox.com/owl/ttl/vocab.ttl#",
+  dcat: "https://www.w3.org/ns/dcat#",
   name: "rdfs:label",
   deadline: "xsd:dateTime",
   lat: "geo:lat",
@@ -11319,7 +11342,7 @@ class Store {
       if (!key) console.log("No key or id for resource:", resource2);
       if (key === "/") key = parentId;
       if (key.startsWith("_:b")) key = key + parentId;
-      if (key === id && resource2["@type"] === this.getExpandedPredicate("ldp:Container", clientContext)) {
+      if (key === id && resource2["@type"] === this.getExpandedPredicate("ldp:Container", clientContext) || resource2["@type"] === this.getExpandedPredicate("dcat:Catalog", clientContext)) {
         if (serverPagination)
           key = appendServerPaginationToIri(key, serverPagination);
         if (serverSearch) key = appendServerSearchToIri(key, serverSearch);
@@ -11376,8 +11399,9 @@ class Store {
    * @param container
    */
   subscribeChildren(container, containerId) {
-    if (!container["ldp:contains"]) return;
-    for (const res of container["ldp:contains"]) {
+    const children = container["listPredicate"];
+    if (!children) return;
+    for (const res of children) {
       this.subscribeResourceTo(containerId, res["@id"] || res.id);
     }
   }
@@ -11491,9 +11515,10 @@ class Store {
   clearCache(id) {
     if (this.cache.has(id)) {
       const resource = this.cache.get(id);
-      if (resource["@type"] === "ldp:Container") {
-        for (const child of resource["ldp:contains"]) {
-          if (child && child["@type"] === "ldp:Container")
+      const predicate = resource["listPredicate"];
+      if (predicate) {
+        for (const child of predicate) {
+          if ((child == null ? void 0 : child["@type"]) && doesResourceContainList(child))
             this.cache.delete(child["@id"]);
         }
       }
@@ -11602,7 +11627,7 @@ class Store {
    * @returns boolean
    */
   _isLocalId(id) {
-    return id.startsWith("store://local.");
+    return id == null ? void 0 : id.startsWith("store://local.");
   }
   /**
    * Make a resource listen changes of another one
@@ -12105,7 +12130,7 @@ class N {
       if (1 === r3.nodeType) {
         if (r3.hasAttributes()) for (const t3 of r3.getAttributeNames()) if (t3.endsWith(e$2)) {
           const i3 = v2[a2++], s3 = r3.getAttribute(t3).split(h$2), e2 = /([.?@])?(.*)/.exec(i3);
-          d2.push({ type: 1, index: c2, name: e2[2], strings: s3, ctor: "." === e2[1] ? H : "?" === e2[1] ? I : "@" === e2[1] ? L : k }), r3.removeAttribute(t3);
+          d2.push({ type: 1, index: c2, name: e2[2], strings: s3, ctor: "." === e2[1] ? H : "?" === e2[1] ? I : "@" === e2[1] ? L : k2 }), r3.removeAttribute(t3);
         } else t3.startsWith(h$2) && (d2.push({ type: 6, index: c2 }), r3.removeAttribute(t3));
         if ($.test(r3.tagName)) {
           const t3 = r3.textContent.split(h$2), s3 = t3.length - 1;
@@ -12226,7 +12251,7 @@ class R {
     void 0 === this._$AM && (this._$Cv = t2, (_a3 = this._$AP) == null ? void 0 : _a3.call(this, t2));
   }
 }
-class k {
+class k2 {
   get tagName() {
     return this.element.tagName;
   }
@@ -12251,7 +12276,7 @@ class k {
     t2 === E ? this.element.removeAttribute(this.name) : this.element.setAttribute(this.name, t2 ?? "");
   }
 }
-class H extends k {
+class H extends k2 {
   constructor() {
     super(...arguments), this.type = 3;
   }
@@ -12259,7 +12284,7 @@ class H extends k {
     this.element[this.name] = t2 === E ? void 0 : t2;
   }
 }
-class I extends k {
+class I extends k2 {
   constructor() {
     super(...arguments), this.type = 4;
   }
@@ -12267,7 +12292,7 @@ class I extends k {
     this.element.toggleAttribute(this.name, !!t2 && t2 !== E);
   }
 }
-class L extends k {
+class L extends k2 {
   constructor(t2, i3, s2, e2, h2) {
     super(t2, i3, s2, e2, h2), this.type = 5;
   }
@@ -12292,8 +12317,8 @@ class z {
     S(this, t2);
   }
 }
-const j2 = t$1.litHtmlPolyfillSupport;
-j2 == null ? void 0 : j2(N, R), (t$1.litHtmlVersions ?? (t$1.litHtmlVersions = [])).push("3.2.1");
+const j = t$1.litHtmlPolyfillSupport;
+j == null ? void 0 : j(N, R), (t$1.litHtmlVersions ?? (t$1.litHtmlVersions = [])).push("3.2.1");
 const B = (t2, i3, s2) => {
   const e2 = (s2 == null ? void 0 : s2.renderBefore) ?? i3;
   let h2 = e2._$litPart$;
@@ -12683,8 +12708,8 @@ function safeDispatchEvent(target, event) {
 function createsStackingContext(el) {
   while (el && el !== document.body) {
     var s2 = window.getComputedStyle(el);
-    var invalid = function(k2, ok) {
-      return !(s2[k2] === void 0 || s2[k2] === ok);
+    var invalid = function(k3, ok) {
+      return !(s2[k3] === void 0 || s2[k3] === ok);
     };
     if (s2.opacity < 1 || invalid("zIndex", "auto") || invalid("transform", "none") || invalid("mixBlendMode", "normal") || invalid("filter", "none") || invalid("perspective", "none") || s2["isolation"] === "isolate" || s2.position === "fixed" || s2.webkitOverflowScrolling === "touch") {
       return true;
@@ -13032,8 +13057,8 @@ dialogPolyfill.isInlinePositionSetByStylesheet = function(element) {
     if (!cssRules) {
       continue;
     }
-    for (var j3 = 0; j3 < cssRules.length; ++j3) {
-      var rule = cssRules[j3];
+    for (var j2 = 0; j2 < cssRules.length; ++j2) {
+      var rule = cssRules[j2];
       var selectedNodes = null;
       try {
         selectedNodes = document.querySelectorAll(rule.selectorText);
@@ -13785,11 +13810,11 @@ const FederationMixin = {
   },
   async fetchSource(containerId) {
     const cachedContainer = store.get(containerId);
-    if (!cachedContainer || cachedContainer["ldp:contains"] === null) {
+    if (!cachedContainer || cachedContainer.getContainerList() === null) {
       store.clearCache(containerId);
     }
     const container = await store.getData(containerId, this.context);
-    return container ? container["ldp:contains"] : null;
+    return container == null ? void 0 : container["listPredicate"];
   }
 };
 const isSet$1 = (field, fields) => {
@@ -13835,7 +13860,7 @@ const matchValue = async (val, query, throwOn) => {
   }
   if ((_a3 = subject.isContainer) == null ? void 0 : _a3.call(subject)) {
     let ret = Promise.resolve(query.value === "");
-    for (const value of subject["ldp:contains"]) {
+    for (const value of subject["listPredicate"]) {
       ret = await ret || await matchValue(value, query);
       if (ret) return orThrow(throwOn, true);
     }
@@ -13883,7 +13908,7 @@ const traversePath = async (resource, path, targetedType) => {
           let targetsRes = await res[remainingPath[0]];
           if (!targetsRes) return [];
           if ((_a3 = targetsRes.isContainer) == null ? void 0 : _a3.call(targetsRes)) {
-            targetsRes = targetsRes["ldp:contains"];
+            targetsRes = targetsRes["listPredicate"];
           }
           if (!Array.isArray(targetsRes)) targetsRes = [targetsRes];
           for (const targetRes of targetsRes) {
@@ -13909,7 +13934,7 @@ 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")) {
+    if (!await resource[filter] && doesResourceContainList(filter)) {
       const path1 = filter.split(".");
       const targetedType = path1[path1.length - 1];
       let targetIds = [];
@@ -14092,7 +14117,7 @@ const FilterMixin = {
     await this.populate();
   },
   async getValuesOfField(field) {
-    const arrayOfDataObjects = this.resource["ldp:contains"];
+    const arrayOfDataObjects = this.resource["listPredicate"];
     const arrayOfDataIds = [];
     for (const obj of arrayOfDataObjects) {
       const nextArrayOfObjects = await obj[field];
@@ -14105,12 +14130,11 @@ const FilterMixin = {
       }
       if (!nextArrayOfObjects.isContainer()) {
         arrayOfDataIds.push(nextArrayOfObjects["@id"]);
-      } else {
-        if (!nextArrayOfObjects["ldp:contains"]) continue;
-        for (const obj2 of nextArrayOfObjects["ldp:contains"]) {
-          arrayOfDataIds.push(obj2["@id"]);
-        }
+        continue;
       }
+      const children = nextArrayOfObjects["listPredicate"];
+      if (!children) continue;
+      arrayOfDataIds.push(...children.map((child) => child["@id"]));
     }
     return arrayOfDataIds;
   },
@@ -14386,7 +14410,7 @@ const ListMixin = {
       );
       const nextProcessor = listPostProcessorsCopy.shift();
       await nextProcessor(
-        this.resource["ldp:contains"],
+        this.resource["listPredicate"],
         listPostProcessorsCopy,
         div,
         this.dataSrc
@@ -14584,7 +14608,7 @@ const RequiredMixin = {
         let hasProps = true;
         for (const field of requiredFields) {
           const res = await resource[field];
-          if (!res) {
+          if (!res || typeof res === "object" && "@value" in res && !res["@value"]) {
             hasProps = false;
             break;
           }
@@ -17429,8 +17453,8 @@ function requireTinymce() {
       const hasOwnProperty$22 = Object.hasOwnProperty;
       const each$f = (obj, f2) => {
         const props = keys2(obj);
-        for (let k2 = 0, len = props.length; k2 < len; k2++) {
-          const i3 = props[k2];
+        for (let k3 = 0, len = props.length; k3 < len; k3++) {
+          const i3 = props[k3];
           const x2 = obj[i3];
           f2(x2, i3);
         }
@@ -18093,8 +18117,8 @@ function requireTinymce() {
       };
       const setAll$1 = (element, attrs) => {
         const dom3 = element.dom;
-        each$f(attrs, (v2, k2) => {
-          rawSet(dom3, k2, v2);
+        each$f(attrs, (v2, k3) => {
+          rawSet(dom3, k3, v2);
         });
       };
       const get$9 = (element, key) => {
@@ -18355,8 +18379,8 @@ function requireTinymce() {
       };
       const setAll = (element, css) => {
         const dom3 = element.dom;
-        each$f(css, (v2, k2) => {
-          internalSet(dom3, k2, v2);
+        each$f(css, (v2, k3) => {
+          internalSet(dom3, k3, v2);
         });
       };
       const get$7 = (element, property) => {
@@ -32441,9 +32465,9 @@ function requireTinymce() {
           const tr = /\/$/.test(path) ? "/" : "";
           let normalizedBase = base2.split("/");
           const normalizedPath = path.split("/");
-          each$5(normalizedBase, (k2) => {
-            if (k2) {
-              o2.push(k2);
+          each$5(normalizedBase, (k3) => {
+            if (k3) {
+              o2.push(k3);
             }
           });
           normalizedBase = o2;
@@ -33215,15 +33239,15 @@ function requireTinymce() {
           const middle = getMiddleSnake(start1, end1, start2, end2);
           if (middle === null || middle.start === end1 && middle.diag === end1 - end2 || middle.end === start1 && middle.diag === start1 - start2) {
             let i3 = start1;
-            let j3 = start2;
-            while (i3 < end1 || j3 < end2) {
-              if (i3 < end1 && j3 < end2 && left[i3] === right[j3]) {
+            let j2 = start2;
+            while (i3 < end1 || j2 < end2) {
+              if (i3 < end1 && j2 < end2 && left[i3] === right[j2]) {
                 script2.push([
                   KEEP,
                   left[i3]
                 ]);
                 ++i3;
-                ++j3;
+                ++j2;
               } else {
                 if (end1 - start1 > end2 - start2) {
                   script2.push([
@@ -33234,9 +33258,9 @@ function requireTinymce() {
                 } else {
                   script2.push([
                     INSERT,
-                    right[j3]
+                    right[j2]
                   ]);
-                  ++j3;
+                  ++j2;
                 }
               }
             }
@@ -33269,43 +33293,43 @@ function requireTinymce() {
           const offset = (sum % 2 === 0 ? sum : sum + 1) / 2;
           vDown[1 + offset] = start1;
           vUp[1 + offset] = end1 + 1;
-          let d2, k2, i3, x2, y2;
+          let d2, k3, i3, x2, y2;
           for (d2 = 0; d2 <= offset; ++d2) {
-            for (k2 = -d2; k2 <= d2; k2 += 2) {
-              i3 = k2 + offset;
-              if (k2 === -d2 || k2 !== d2 && vDown[i3 - 1] < vDown[i3 + 1]) {
+            for (k3 = -d2; k3 <= d2; k3 += 2) {
+              i3 = k3 + offset;
+              if (k3 === -d2 || k3 !== d2 && vDown[i3 - 1] < vDown[i3 + 1]) {
                 vDown[i3] = vDown[i3 + 1];
               } else {
                 vDown[i3] = vDown[i3 - 1] + 1;
               }
               x2 = vDown[i3];
-              y2 = x2 - start1 + start2 - k2;
+              y2 = x2 - start1 + start2 - k3;
               while (x2 < end1 && y2 < end2 && left[x2] === right[y2]) {
                 vDown[i3] = ++x2;
                 ++y2;
               }
-              if (delta % 2 !== 0 && delta - d2 <= k2 && k2 <= delta + d2) {
+              if (delta % 2 !== 0 && delta - d2 <= k3 && k3 <= delta + d2) {
                 if (vUp[i3 - delta] <= vDown[i3]) {
-                  return buildSnake(vUp[i3 - delta], k2 + start1 - start2, end1, end2);
+                  return buildSnake(vUp[i3 - delta], k3 + start1 - start2, end1, end2);
                 }
               }
             }
-            for (k2 = delta - d2; k2 <= delta + d2; k2 += 2) {
-              i3 = k2 + offset - delta;
-              if (k2 === delta - d2 || k2 !== delta + d2 && vUp[i3 + 1] <= vUp[i3 - 1]) {
+            for (k3 = delta - d2; k3 <= delta + d2; k3 += 2) {
+              i3 = k3 + offset - delta;
+              if (k3 === delta - d2 || k3 !== delta + d2 && vUp[i3 + 1] <= vUp[i3 - 1]) {
                 vUp[i3] = vUp[i3 + 1] - 1;
               } else {
                 vUp[i3] = vUp[i3 - 1];
               }
               x2 = vUp[i3] - 1;
-              y2 = x2 - start1 + start2 - k2;
+              y2 = x2 - start1 + start2 - k3;
               while (x2 >= start1 && y2 >= start2 && left[x2] === right[y2]) {
                 vUp[i3] = x2--;
                 y2--;
               }
-              if (delta % 2 === 0 && -d2 <= k2 && k2 <= d2) {
+              if (delta % 2 === 0 && -d2 <= k3 && k3 <= d2) {
                 if (vUp[i3] <= vDown[i3 + delta]) {
-                  return buildSnake(vUp[i3], k2 + start1 - start2, end1, end2);
+                  return buildSnake(vUp[i3], k3 + start1 - start2, end1, end2);
                 }
               }
             }
@@ -38605,8 +38629,8 @@ Options:${listJoiner}${removedOptions2.join(listJoiner)}` : "";
             throw new Error(`Can't merge zero objects`);
           }
           const ret = {};
-          for (let j3 = 0; j3 < objects.length; j3++) {
-            const curObject = objects[j3];
+          for (let j2 = 0; j2 < objects.length; j2++) {
+            const curObject = objects[j2];
             for (const key in curObject) {
               if (has$2(curObject, key)) {
                 ret[key] = merger(ret[key], curObject[key]);
@@ -45470,7 +45494,7 @@ Options:${listJoiner}${removedOptions2.join(listJoiner)}` : "";
             return keys3[index2];
           },
           removeItem: (key) => {
-            keys3 = keys3.filter((k2) => k2 === key);
+            keys3 = keys3.filter((k3) => k3 === key);
             delete data2[key];
           },
           clear: () => {
@@ -45942,8 +45966,8 @@ function requireTheme() {
     const hasOwnProperty2 = Object.hasOwnProperty;
     const each = (obj, f2) => {
       const props = keys2(obj);
-      for (let k2 = 0, len = props.length; k2 < len; k2++) {
-        const i3 = props[k2];
+      for (let k3 = 0, len = props.length; k3 < len; k3++) {
+        const i3 = props[k3];
         const x2 = obj[i3];
         f2(x2, i3);
       }
@@ -45995,8 +46019,8 @@ function requireTheme() {
     };
     const find$4 = (obj, pred) => {
       const props = keys2(obj);
-      for (let k2 = 0, len = props.length; k2 < len; k2++) {
-        const i3 = props[k2];
+      for (let k3 = 0, len = props.length; k3 < len; k3++) {
+        const i3 = props[k3];
         const x2 = obj[i3];
         if (pred(x2, i3, obj)) {
           return Optional.some(x2);
@@ -46229,8 +46253,8 @@ function requireTheme() {
     };
     const setAll$1 = (element2, attrs) => {
       const dom3 = element2.dom;
-      each(attrs, (v2, k2) => {
-        rawSet(dom3, k2, v2);
+      each(attrs, (v2, k3) => {
+        rawSet(dom3, k3, v2);
       });
     };
     const get$f = (element2, key) => {
@@ -46269,17 +46293,17 @@ function requireTheme() {
     };
     const setAll = (element2, css) => {
       const dom3 = element2.dom;
-      each(css, (v2, k2) => {
-        internalSet(dom3, k2, v2);
+      each(css, (v2, k3) => {
+        internalSet(dom3, k3, v2);
       });
     };
     const setOptions = (element2, css) => {
       const dom3 = element2.dom;
-      each(css, (v2, k2) => {
+      each(css, (v2, k3) => {
         v2.fold(() => {
-          internalRemove(dom3, k2);
+          internalRemove(dom3, k3);
         }, (value2) => {
-          internalSet(dom3, k2, value2);
+          internalSet(dom3, k3, value2);
         });
       });
     };
@@ -47102,8 +47126,8 @@ function requireTheme() {
           throw new Error(`Can't merge zero objects`);
         }
         const ret = {};
-        for (let j3 = 0; j3 < objects.length; j3++) {
-          const curObject = objects[j3];
+        for (let j2 = 0; j2 < objects.length; j2++) {
+          const curObject = objects[j2];
           for (const key in curObject) {
             if (has$2(curObject, key)) {
               ret[key] = merger(ret[key], curObject[key]);
@@ -47247,7 +47271,7 @@ function requireTheme() {
       }, {});
       const extract2 = (path2, o2) => {
         const keys3 = isBoolean2(o2) ? [] : getSetKeys(o2);
-        const extra = filter$2(keys3, (k2) => !hasNonNullableKey(fieldNames, k2));
+        const extra = filter$2(keys3, (k3) => !hasNonNullableKey(fieldNames, k3));
         return extra.length === 0 ? delegate.extract(path2, o2) : unsupportedFields(path2, extra);
       };
       return {
@@ -47552,9 +47576,9 @@ function requireTheme() {
     };
     const exclude$1 = (obj, fields) => {
       const r4 = {};
-      each(obj, (v2, k2) => {
-        if (!contains$2(fields, k2)) {
-          r4[k2] = v2;
+      each(obj, (v2, k3) => {
+        if (!contains$2(fields, k3)) {
+          r4[k3] = v2;
         }
       });
       return r4;
@@ -48313,8 +48337,8 @@ function requireTheme() {
       const newKeys = keys2(newObj);
       const oldKeys = keys2(oldObj);
       const toRemove = difference(oldKeys, newKeys);
-      const toSet = bifilter(newObj, (v2, k2) => {
-        return !has$2(oldObj, k2) || v2 !== oldObj[k2];
+      const toSet = bifilter(newObj, (v2, k3) => {
+        return !has$2(oldObj, k3) || v2 !== oldObj[k3];
       }).t;
       return {
         toRemove,
@@ -51043,7 +51067,7 @@ function requireTheme() {
       const config3 = asRawOrDie$1("Sketcher for " + rawConfig.name, singleSchema, rawConfig);
       const sketch2 = (spec) => single$1(config3.name, config3.configFields, config3.factory, spec);
       const apis = map$1(config3.apis, makeApi);
-      const extraApis = map$1(config3.extraApis, (f2, k2) => markAsExtraApi(f2, k2));
+      const extraApis = map$1(config3.extraApis, (f2, k3) => markAsExtraApi(f2, k3));
       return {
         name: config3.name,
         configFields: config3.configFields,
@@ -51057,7 +51081,7 @@ function requireTheme() {
       const sketch2 = (spec) => composite$1(config3.name, config3.configFields, config3.partFields, config3.factory, spec);
       const parts2 = generate$3(config3.name, config3.partFields);
       const apis = map$1(config3.apis, makeApi);
-      const extraApis = map$1(config3.extraApis, (f2, k2) => markAsExtraApi(f2, k2));
+      const extraApis = map$1(config3.extraApis, (f2, k3) => markAsExtraApi(f2, k3));
       return {
         name: config3.name,
         partFields: config3.partFields,
@@ -52469,9 +52493,9 @@ function requireTheme() {
       partFields: parts$g(),
       factory: make$7
     });
-    const transpose$1 = (obj) => tupleMap(obj, (v2, k2) => ({
+    const transpose$1 = (obj) => tupleMap(obj, (v2, k3) => ({
       k: v2,
-      v: k2
+      v: k3
     }));
     const trace = (items, byItem, byMenu, finish) => get$g(byMenu, finish).bind((triggerItem) => get$g(items, triggerItem).bind((triggerMenu) => {
       const rest = trace(items, byItem, byMenu, triggerMenu);
@@ -52635,8 +52659,8 @@ function requireTheme() {
       });
       const updateAriaExpansions = (container, path2) => {
         const parentItems = getSubmenuParents(container);
-        each(parentItems, (v2, k2) => {
-          const expanded = contains$2(path2, k2);
+        each(parentItems, (v2, k3) => {
+          const expanded = contains$2(path2, k3);
           set$9(v2.element, "aria-expanded", expanded);
         });
       };
@@ -55554,8 +55578,8 @@ function requireTheme() {
       const cells = [];
       for (let i3 = 0; i3 < numRows; i3++) {
         const row = [];
-        for (let j3 = 0; j3 < numCols; j3++) {
-          row.push(makeCell(i3, j3, labelId));
+        for (let j2 = 0; j2 < numCols; j2++) {
+          row.push(makeCell(i3, j2, labelId));
         }
         cells.push(row);
       }
@@ -55563,8 +55587,8 @@ function requireTheme() {
     };
     const selectCells = (cells, selectedRow, selectedColumn, numRows, numColumns) => {
       for (let i3 = 0; i3 < numRows; i3++) {
-        for (let j3 = 0; j3 < numColumns; j3++) {
-          Toggling.set(cells[i3][j3], i3 <= selectedRow && j3 <= selectedColumn);
+        for (let j2 = 0; j2 < numColumns; j2++) {
+          Toggling.set(cells[i3][j2], i3 <= selectedRow && j2 <= selectedColumn);
         }
       }
     };
@@ -56227,10 +56251,10 @@ function requireTheme() {
     const EventRegistry = () => {
       const registry = {};
       const registerId = (extraArgs, id, events3) => {
-        each(events3, (v2, k2) => {
-          const handlers2 = registry[k2] !== void 0 ? registry[k2] : {};
+        each(events3, (v2, k3) => {
+          const handlers2 = registry[k3] !== void 0 ? registry[k3] : {};
           handlers2[id] = curryArgs(v2, extraArgs);
-          registry[k2] = handlers2;
+          registry[k3] = handlers2;
         });
       };
       const findHandler = (handlers2, elem) => read$1(elem).bind((id) => get$g(handlers2, id)).map((descHandler) => eventHandler(elem, descHandler));
@@ -70360,9 +70384,9 @@ function requireTheme() {
           const newInternalData = validateData$1(access, mergedData);
           const form = access.getFormWrapper();
           Representing.setValue(form, newInternalData);
-          each(menuItemStates, (v2, k2) => {
-            if (has$2(mergedData, k2)) {
-              v2.set(mergedData[k2]);
+          each(menuItemStates, (v2, k3) => {
+            if (has$2(mergedData, k3)) {
+              v2.set(mergedData[k3]);
             }
           });
         });
@@ -71294,8 +71318,8 @@ function requireModel() {
     const hasOwnProperty2 = Object.hasOwnProperty;
     const each$1 = (obj, f2) => {
       const props = keys2(obj);
-      for (let k2 = 0, len = props.length; k2 < len; k2++) {
-        const i3 = props[k2];
+      for (let k3 = 0, len = props.length; k3 < len; k3++) {
+        const i3 = props[k3];
         const x2 = obj[i3];
         f2(x2, i3);
       }
@@ -71383,16 +71407,16 @@ function requireModel() {
     };
     const setAll$1 = (element, attrs) => {
       const dom2 = element.dom;
-      each$1(attrs, (v2, k2) => {
-        rawSet(dom2, k2, v2);
+      each$1(attrs, (v2, k3) => {
+        rawSet(dom2, k3, v2);
       });
     };
     const setOptions = (element, attrs) => {
-      each$1(attrs, (v2, k2) => {
+      each$1(attrs, (v2, k3) => {
         v2.fold(() => {
-          remove$7(element, k2);
+          remove$7(element, k3);
         }, (value2) => {
-          rawSet(element.dom, k2, value2);
+          rawSet(element.dom, k3, value2);
         });
       });
     };
@@ -71832,8 +71856,8 @@ function requireModel() {
     };
     const setAll = (element, css2) => {
       const dom2 = element.dom;
-      each$1(css2, (v2, k2) => {
-        internalSet(dom2, k2, v2);
+      each$1(css2, (v2, k3) => {
+        internalSet(dom2, k3, v2);
       });
     };
     const get$a = (element, property) => {
@@ -72979,9 +73003,9 @@ function requireModel() {
       const totalRows = house.grid.rows;
       for (let i3 = 0; i3 < totalRows; i3++) {
         let seenSelected = false;
-        for (let j3 = 0; j3 < totalColumns; j3++) {
-          if (!(i3 < stats.minRow || i3 > stats.maxRow || j3 < stats.minCol || j3 > stats.maxCol)) {
-            const needCell = Warehouse.getAt(house, i3, j3).filter(isSelected).isNone();
+        for (let j2 = 0; j2 < totalColumns; j2++) {
+          if (!(i3 < stats.minRow || i3 > stats.maxRow || j2 < stats.minCol || j2 > stats.maxCol)) {
+            const needCell = Warehouse.getAt(house, i3, j2).filter(isSelected).isNone();
             if (needCell) {
               makeCell(rows2, seenSelected, i3);
             } else {
@@ -73113,11 +73137,11 @@ function requireModel() {
     };
     const replace$1 = (cell2, tag, attrs) => {
       const replica = copy$2(cell2, tag);
-      each$1(attrs, (v2, k2) => {
+      each$1(attrs, (v2, k3) => {
         if (v2 === null) {
-          remove$7(replica, k2);
+          remove$7(replica, k3);
         } else {
-          set$2(replica, k2, v2);
+          set$2(replica, k3, v2);
         }
       });
       return replica;
@@ -73242,8 +73266,8 @@ function requireModel() {
       let isRect = true;
       const detailIsWithin = curry(isWithin, bounds2);
       for (let i3 = bounds2.startRow; i3 <= bounds2.finishRow; i3++) {
-        for (let j3 = bounds2.startCol; j3 <= bounds2.finishCol; j3++) {
-          isRect = isRect && Warehouse.getAt(warehouse, i3, j3).exists(detailIsWithin);
+        for (let j2 = bounds2.startCol; j2 <= bounds2.finishCol; j2++) {
+          isRect = isRect && Warehouse.getAt(warehouse, i3, j2).exists(detailIsWithin);
         }
       }
       return isRect ? Optional.some(bounds2) : Optional.none();
@@ -74269,10 +74293,10 @@ function requireModel() {
         return grid2;
       }
       for (let i3 = bounds2.startRow; i3 <= bounds2.finishRow; i3++) {
-        for (let j3 = bounds2.startCol; j3 <= bounds2.finishCol; j3++) {
+        for (let j2 = bounds2.startCol; j2 <= bounds2.finishCol; j2++) {
           const row2 = rows2[i3];
-          const isLocked = getCell(row2, j3).isLocked;
-          mutateCell(row2, j3, elementnew(substitution(), false, isLocked));
+          const isLocked = getCell(row2, j2).isLocked;
+          mutateCell(row2, j2, elementnew(substitution(), false, isLocked));
         }
       }
       return grid2;
@@ -74281,13 +74305,13 @@ function requireModel() {
       const rows2 = extractGridDetails(grid2).rows;
       let first2 = true;
       for (let i3 = 0; i3 < rows2.length; i3++) {
-        for (let j3 = 0; j3 < cellLength(rows2[0]); j3++) {
+        for (let j2 = 0; j2 < cellLength(rows2[0]); j2++) {
           const row2 = rows2[i3];
-          const currentCell = getCell(row2, j3);
+          const currentCell = getCell(row2, j2);
           const currentCellElm = currentCell.element;
           const isToReplace = comparator(currentCellElm, target);
           if (isToReplace && !first2) {
-            mutateCell(row2, j3, elementnew(substitution(), true, currentCell.isLocked));
+            mutateCell(row2, j2, elementnew(substitution(), true, currentCell.isLocked));
           } else if (isToReplace) {
             first2 = false;
           }
@@ -74323,16 +74347,16 @@ function requireModel() {
         each$2(cells2, (cell2) => {
           let replacement = Optional.none();
           for (let i3 = index2; i3 < rows2.length; i3++) {
-            for (let j3 = 0; j3 < cellLength(rows2[0]); j3++) {
+            for (let j2 = 0; j2 < cellLength(rows2[0]); j2++) {
               const row2 = rows2[i3];
-              const current = getCell(row2, j3);
+              const current = getCell(row2, j2);
               const isToReplace = comparator(current.element, cell2.element);
               if (isToReplace) {
                 if (replacement.isNone()) {
                   replacement = Optional.some(substitution());
                 }
                 replacement.each((sub) => {
-                  mutateCell(row2, j3, elementnew(sub, true, current.isLocked));
+                  mutateCell(row2, j2, elementnew(sub, true, current.isLocked));
                 });
               }
             }
@@ -75946,9 +75970,9 @@ function requireModel() {
     const tableColumn = () => SugarElement.fromTag("col");
     const createRow = (columns2, rowHeaders, columnHeaders, rowIndex) => {
       const tr = SugarElement.fromTag("tr");
-      for (let j3 = 0; j3 < columns2; j3++) {
-        const td = rowIndex < rowHeaders || j3 < columnHeaders ? tableHeaderCell() : tableCell();
-        if (j3 < columnHeaders) {
+      for (let j2 = 0; j2 < columns2; j2++) {
+        const td = rowIndex < rowHeaders || j2 < columnHeaders ? tableHeaderCell() : tableCell();
+        if (j2 < columnHeaders) {
           set$2(td, "scope", "row");
         }
         if (rowIndex < rowHeaders) {
@@ -79279,8 +79303,8 @@ function requirePlugin$2() {
     const keys2 = Object.keys;
     const each = (obj, f2) => {
       const props = keys2(obj);
-      for (let k2 = 0, len = props.length; k2 < len; k2++) {
-        const i3 = props[k2];
+      for (let k3 = 0, len = props.length; k3 < len; k3++) {
+        const i3 = props[k3];
         const x2 = obj[i3];
         f2(x2, i3);
       }
@@ -79310,8 +79334,8 @@ function requirePlugin$2() {
     };
     const setAll = (element, attrs) => {
       const dom2 = element.dom;
-      each(attrs, (v2, k2) => {
-        rawSet(dom2, k2, v2);
+      each(attrs, (v2, k3) => {
+        rawSet(dom2, k3, v2);
       });
     };
     const clone$1 = (element) => foldl(element.dom.attributes, (acc, attr) => {
@@ -80361,7 +80385,7 @@ function requirePlugin$2() {
           editor.dom.setStyles(parentList, update.styles);
         }
         if (isObject2(update.attrs)) {
-          each(update.attrs, (v2, k2) => editor.dom.setAttrib(parentList, k2, v2));
+          each(update.attrs, (v2, k3) => editor.dom.setAttrib(parentList, k3, v2));
         }
       });
     };
@@ -80926,8 +80950,8 @@ function requirePlugin$1() {
     const hasOwnProperty2 = Object.hasOwnProperty;
     const each = (obj, f2) => {
       const props = keys2(obj);
-      for (let k2 = 0, len = props.length; k2 < len; k2++) {
-        const i3 = props[k2];
+      for (let k3 = 0, len = props.length; k3 < len; k3++) {
+        const i3 = props[k3];
         const x2 = obj[i3];
         f2(x2, i3);
       }
@@ -85787,11 +85811,11 @@ Url.prototype.parse = function(url2, slashesDenoteHost) {
         }
         if (!part.match(hostnamePartPattern)) {
           let newpart = "";
-          for (let j3 = 0, k2 = part.length; j3 < k2; j3++) {
-            if (part.charCodeAt(j3) > 127) {
+          for (let j2 = 0, k3 = part.length; j2 < k3; j2++) {
+            if (part.charCodeAt(j2) > 127) {
               newpart += "x";
             } else {
-              newpart += part[j3];
+              newpart += part[j2];
             }
           }
           if (!newpart.match(hostnamePartPattern)) {
@@ -87089,11 +87113,11 @@ function linkify$1(state) {
   if (!state.md.options.linkify) {
     return;
   }
-  for (let j3 = 0, l2 = blockTokens.length; j3 < l2; j3++) {
-    if (blockTokens[j3].type !== "inline" || !state.md.linkify.pretest(blockTokens[j3].content)) {
+  for (let j2 = 0, l2 = blockTokens.length; j2 < l2; j2++) {
+    if (blockTokens[j2].type !== "inline" || !state.md.linkify.pretest(blockTokens[j2].content)) {
       continue;
     }
-    let tokens = blockTokens[j3].children;
+    let tokens = blockTokens[j2].children;
     let htmlLinkLevel = 0;
     for (let i3 = tokens.length - 1; i3 >= 0; i3--) {
       const currentToken = tokens[i3];
@@ -87168,7 +87192,7 @@ function linkify$1(state) {
           token.level = level2;
           nodes.push(token);
         }
-        blockTokens[j3].children = tokens = arrayReplaceAt(tokens, i3, nodes);
+        blockTokens[j2].children = tokens = arrayReplaceAt(tokens, i3, nodes);
       }
     }
   }
@@ -87240,17 +87264,17 @@ function replaceAt(str, index2, ch) {
   return str.slice(0, index2) + ch + str.slice(index2 + 1);
 }
 function process_inlines(tokens, state) {
-  let j3;
+  let j2;
   const stack = [];
   for (let i3 = 0; i3 < tokens.length; i3++) {
     const token = tokens[i3];
     const thisLevel = tokens[i3].level;
-    for (j3 = stack.length - 1; j3 >= 0; j3--) {
-      if (stack[j3].level <= thisLevel) {
+    for (j2 = stack.length - 1; j2 >= 0; j2--) {
+      if (stack[j2].level <= thisLevel) {
         break;
       }
     }
-    stack.length = j3 + 1;
+    stack.length = j2 + 1;
     if (token.type !== "text") {
       continue;
     }
@@ -87272,10 +87296,10 @@ function process_inlines(tokens, state) {
         if (t2.index - 1 >= 0) {
           lastChar = text2.charCodeAt(t2.index - 1);
         } else {
-          for (j3 = i3 - 1; j3 >= 0; j3--) {
-            if (tokens[j3].type === "softbreak" || tokens[j3].type === "hardbreak") break;
-            if (!tokens[j3].content) continue;
-            lastChar = tokens[j3].content.charCodeAt(tokens[j3].content.length - 1);
+          for (j2 = i3 - 1; j2 >= 0; j2--) {
+            if (tokens[j2].type === "softbreak" || tokens[j2].type === "hardbreak") break;
+            if (!tokens[j2].content) continue;
+            lastChar = tokens[j2].content.charCodeAt(tokens[j2].content.length - 1);
             break;
           }
         }
@@ -87283,10 +87307,10 @@ function process_inlines(tokens, state) {
         if (pos < max) {
           nextChar = text2.charCodeAt(pos);
         } else {
-          for (j3 = i3 + 1; j3 < tokens.length; j3++) {
-            if (tokens[j3].type === "softbreak" || tokens[j3].type === "hardbreak") break;
-            if (!tokens[j3].content) continue;
-            nextChar = tokens[j3].content.charCodeAt(0);
+          for (j2 = i3 + 1; j2 < tokens.length; j2++) {
+            if (tokens[j2].type === "softbreak" || tokens[j2].type === "hardbreak") break;
+            if (!tokens[j2].content) continue;
+            nextChar = tokens[j2].content.charCodeAt(0);
             break;
           }
         }
@@ -87324,13 +87348,13 @@ function process_inlines(tokens, state) {
           continue;
         }
         if (canClose) {
-          for (j3 = stack.length - 1; j3 >= 0; j3--) {
-            let item = stack[j3];
-            if (stack[j3].level < thisLevel) {
+          for (j2 = stack.length - 1; j2 >= 0; j2--) {
+            let item = stack[j2];
+            if (stack[j2].level < thisLevel) {
               break;
             }
-            if (item.single === isSingle && stack[j3].level === thisLevel) {
-              item = stack[j3];
+            if (item.single === isSingle && stack[j2].level === thisLevel) {
+              item = stack[j2];
               let openQuote;
               let closeQuote;
               if (isSingle) {
@@ -87352,7 +87376,7 @@ function process_inlines(tokens, state) {
               }
               text2 = token.content;
               max = text2.length;
-              stack.length = j3;
+              stack.length = j2;
               continue OUTER;
             }
           }
@@ -87385,9 +87409,9 @@ function text_join(state) {
   let curr, last;
   const blockTokens = state.tokens;
   const l2 = blockTokens.length;
-  for (let j3 = 0; j3 < l2; j3++) {
-    if (blockTokens[j3].type !== "inline") continue;
-    const tokens = blockTokens[j3].children;
+  for (let j2 = 0; j2 < l2; j2++) {
+    if (blockTokens[j2].type !== "inline") continue;
+    const tokens = blockTokens[j2].children;
     const max = tokens.length;
     for (curr = 0; curr < max; curr++) {
       if (tokens[curr].type === "text_special") {
@@ -89093,14 +89117,14 @@ function postProcess$1(state, delimiters) {
   }
   while (loneMarkers.length) {
     const i3 = loneMarkers.pop();
-    let j3 = i3 + 1;
-    while (j3 < state.tokens.length && state.tokens[j3].type === "s_close") {
-      j3++;
-    }
-    j3--;
-    if (i3 !== j3) {
-      token = state.tokens[j3];
-      state.tokens[j3] = state.tokens[i3];
+    let j2 = i3 + 1;
+    while (j2 < state.tokens.length && state.tokens[j2].type === "s_close") {
+      j2++;
+    }
+    j2--;
+    if (i3 !== j2) {
+      token = state.tokens[j2];
+      state.tokens[j2] = state.tokens[i3];
       state.tokens[i3] = token;
     }
   }
@@ -89816,8 +89840,8 @@ const defaultOptions$1 = {
   fuzzyIP: false
 };
 function isOptionsObj(obj) {
-  return Object.keys(obj || {}).reduce(function(acc, k2) {
-    return acc || defaultOptions$1.hasOwnProperty(k2);
+  return Object.keys(obj || {}).reduce(function(acc, k3) {
+    return acc || defaultOptions$1.hasOwnProperty(k3);
   }, false);
 }
 const defaultSchemas = {
@@ -90210,13 +90234,13 @@ const digitToBasic = function(digit, flag) {
   return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
 };
 const adapt = function(delta, numPoints, firstTime) {
-  let k2 = 0;
+  let k3 = 0;
   delta = firstTime ? floor(delta / damp) : delta >> 1;
   delta += floor(delta / numPoints);
-  for (; delta > baseMinusTMin * tMax >> 1; k2 += base) {
+  for (; delta > baseMinusTMin * tMax >> 1; k3 += base) {
     delta = floor(delta / baseMinusTMin);
   }
-  return floor(k2 + (baseMinusTMin + 1) * delta / (delta + skew));
+  return floor(k3 + (baseMinusTMin + 1) * delta / (delta + skew));
 };
 const decode = function(input) {
   const output = [];
@@ -90228,15 +90252,15 @@ const decode = function(input) {
   if (basic < 0) {
     basic = 0;
   }
-  for (let j3 = 0; j3 < basic; ++j3) {
-    if (input.charCodeAt(j3) >= 128) {
+  for (let j2 = 0; j2 < basic; ++j2) {
+    if (input.charCodeAt(j2) >= 128) {
       error("not-basic");
     }
-    output.push(input.charCodeAt(j3));
+    output.push(input.charCodeAt(j2));
   }
   for (let index2 = basic > 0 ? basic + 1 : 0; index2 < inputLength; ) {
     const oldi = i3;
-    for (let w = 1, k2 = base; ; k2 += base) {
+    for (let w = 1, k3 = base; ; k3 += base) {
       if (index2 >= inputLength) {
         error("invalid-input");
       }
@@ -90248,7 +90272,7 @@ const decode = function(input) {
         error("overflow");
       }
       i3 += digit * w;
-      const t2 = k2 <= bias ? tMin : k2 >= bias + tMax ? tMax : k2 - bias;
+      const t2 = k3 <= bias ? tMin : k3 >= bias + tMax ? tMax : k3 - bias;
       if (digit < t2) {
         break;
       }
@@ -90305,8 +90329,8 @@ const encode = function(input) {
       }
       if (currentValue === n3) {
         let q = delta;
-        for (let k2 = base; ; k2 += base) {
-          const t2 = k2 <= bias ? tMin : k2 >= bias + tMax ? tMax : k2 - bias;
+        for (let k3 = base; ; k3 += base) {
+          const t2 = k3 <= bias ? tMin : k3 >= bias + tMax ? tMax : k3 - bias;
           if (q < t2) {
             break;
           }
@@ -92839,15 +92863,15 @@ function requireDiff() {
           }
         }
       }
-      for (var k2 = -d2 + k2start; k2 <= d2 - k2end; k2 += 2) {
-        var k2_offset = v_offset + k2;
+      for (var k22 = -d2 + k2start; k22 <= d2 - k2end; k22 += 2) {
+        var k2_offset = v_offset + k22;
         var x22;
-        if (k2 === -d2 || k2 !== d2 && v2[k2_offset - 1] < v2[k2_offset + 1]) {
+        if (k22 === -d2 || k22 !== d2 && v2[k2_offset - 1] < v2[k2_offset + 1]) {
           x22 = v2[k2_offset + 1];
         } else {
           x22 = v2[k2_offset - 1] + 1;
         }
-        var y2 = x22 - k2;
+        var y2 = x22 - k22;
         while (x22 < text1_length && y2 < text2_length && text1.charAt(text1_length - x22 - 1) === text2.charAt(text2_length - y2 - 1)) {
           x22++;
           y2++;
@@ -92858,7 +92882,7 @@ function requireDiff() {
         } else if (y2 > text2_length) {
           k2start += 2;
         } else if (!front) {
-          var k1_offset = v_offset + delta - k2;
+          var k1_offset = v_offset + delta - k22;
           if (k1_offset >= 0 && k1_offset < v_length && v1[k1_offset] !== -1) {
             var x1 = v1[k1_offset];
             var y1 = v_offset + x1 - k1_offset;
@@ -92966,24 +92990,24 @@ function requireDiff() {
     }
     function diff_halfMatchI_(longtext2, shorttext2, i3) {
       var seed = longtext2.substring(i3, i3 + Math.floor(longtext2.length / 4));
-      var j3 = -1;
+      var j2 = -1;
       var best_common = "";
       var best_longtext_a, best_longtext_b, best_shorttext_a, best_shorttext_b;
-      while ((j3 = shorttext2.indexOf(seed, j3 + 1)) !== -1) {
+      while ((j2 = shorttext2.indexOf(seed, j2 + 1)) !== -1) {
         var prefixLength = diff_commonPrefix(
           longtext2.substring(i3),
-          shorttext2.substring(j3)
+          shorttext2.substring(j2)
         );
         var suffixLength = diff_commonSuffix(
           longtext2.substring(0, i3),
-          shorttext2.substring(0, j3)
+          shorttext2.substring(0, j2)
         );
         if (best_common.length < suffixLength + prefixLength) {
-          best_common = shorttext2.substring(j3 - suffixLength, j3) + shorttext2.substring(j3, j3 + prefixLength);
+          best_common = shorttext2.substring(j2 - suffixLength, j2) + shorttext2.substring(j2, j2 + prefixLength);
           best_longtext_a = longtext2.substring(0, i3 - suffixLength);
           best_longtext_b = longtext2.substring(i3 + prefixLength);
-          best_shorttext_a = shorttext2.substring(0, j3 - suffixLength);
-          best_shorttext_b = shorttext2.substring(j3 + prefixLength);
+          best_shorttext_a = shorttext2.substring(0, j2 - suffixLength);
+          best_shorttext_b = shorttext2.substring(j2 + prefixLength);
         }
       }
       if (best_common.length * 2 >= longtext2.length) {
@@ -93240,18 +93264,18 @@ function requireDiff() {
               if (!diffs[previous_equality][1]) {
                 diffs.splice(previous_equality, 1);
                 pointer--;
-                var k2 = previous_equality - 1;
-                if (diffs[k2] && diffs[k2][0] === DIFF_INSERT) {
+                var k3 = previous_equality - 1;
+                if (diffs[k3] && diffs[k3][0] === DIFF_INSERT) {
                   count_insert++;
-                  text_insert = diffs[k2][1] + text_insert;
-                  k2--;
+                  text_insert = diffs[k3][1] + text_insert;
+                  k3--;
                 }
-                if (diffs[k2] && diffs[k2][0] === DIFF_DELETE) {
+                if (diffs[k3] && diffs[k3][0] === DIFF_DELETE) {
                   count_delete++;
-                  text_delete = diffs[k2][1] + text_delete;
-                  k2--;
+                  text_delete = diffs[k3][1] + text_delete;
+                  k3--;
                 }
-                previous_equality = k2;
+                previous_equality = k3;
               }
             }
             if (starts_with_pair_end(diffs[pointer][1])) {
@@ -95834,7 +95858,7 @@ function requireEventemitter3() {
         }
         listeners.fn.apply(listeners.context, args);
       } else {
-        var length = listeners.length, j3;
+        var length = listeners.length, j2;
         for (i3 = 0; i3 < length; i3++) {
           if (listeners[i3].once) this.removeListener(event, listeners[i3].fn, void 0, true);
           switch (len) {
@@ -95851,8 +95875,8 @@ function requireEventemitter3() {
               listeners[i3].fn.call(listeners[i3].context, a1, a2, a3);
               break;
             default:
-              if (!args) for (j3 = 1, args = new Array(len - 1); j3 < len; j3++) {
-                args[j3 - 1] = arguments[j3];
+              if (!args) for (j2 = 1, args = new Array(len - 1); j2 < len; j2++) {
+                args[j2 - 1] = arguments[j2];
               }
               listeners[i3].fn.apply(listeners[i3].context, args);
           }
@@ -102301,9 +102325,11 @@ const MultipleFormMixin = {
     if (nextProcessor) nextProcessor(value, listValueTransformations);
   },
   populate() {
-    if (!this.resource || !this.resource["ldp:contains"]) return;
+    var _a3;
+    const resources = (_a3 = this.resource) == null ? void 0 : _a3["listPredicate"];
+    if (!resources) return;
     this.listAttributes.children = [];
-    for (const resource of this.resource["ldp:contains"]) {
+    for (const resource of resources) {
       this.insertWidget(resource["@id"]);
     }
     this.planRender();
@@ -102404,9 +102430,10 @@ const MultipleselectFormMixin = {
     if (nextProcessor) nextProcessor(value, listValueTransformations);
   },
   populate() {
-    if (!this.resource || !this.resource["ldp:contains"] && !Array.isArray(this.resource))
-      return;
-    this.setValue(this.resource["ldp:contains"]);
+    var _a3;
+    const resources = (_a3 = this.resource) == null ? void 0 : _a3["listPredicate"];
+    if (!this.resource || !resources && !Array.isArray(this.resource)) return;
+    this.setValue(resources);
     this.planRender();
   },
   setValue(values) {
@@ -102497,7 +102524,7 @@ const RangeMixin = {
     this.listAttributes.optionValue = this.optionValue;
   },
   async populate() {
-    const resources = this.resource ? this.resource["ldp:contains"] : [];
+    const resources = this.resource ? this.resource["listPredicate"] : [];
     const listPostProcessorsCopy = this.listPostProcessors.deepCopy();
     listPostProcessorsCopy.attach(
       this.setRangeAttribute.bind(this),
@@ -102876,7 +102903,7 @@ function requireOpLinkSanitizer() {
     if (mod && mod.__esModule) return mod;
     var result = {};
     if (mod != null) {
-      for (var k2 in mod) if (Object.hasOwnProperty.call(mod, k2)) result[k2] = mod[k2];
+      for (var k3 in mod) if (Object.hasOwnProperty.call(mod, k3)) result[k3] = mod[k3];
     }
     result["default"] = mod;
     return result;
@@ -103135,9 +103162,9 @@ function requireOpAttributeSanitizer() {
           cleanAttrs.mention = mention;
         }
       }
-      return Object.keys(dirtyAttrs).reduce(function(cleaned, k2) {
-        if (sanitizedAttrs.indexOf(k2) === -1) {
-          cleaned[k2] = dirtyAttrs[k2];
+      return Object.keys(dirtyAttrs).reduce(function(cleaned, k3) {
+        if (sanitizedAttrs.indexOf(k3) === -1) {
+          cleaned[k3] = dirtyAttrs[k3];
         }
         return cleaned;
       }, cleanAttrs);
@@ -103249,7 +103276,7 @@ function requireInsertOpDenormalizer() {
     if (mod && mod.__esModule) return mod;
     var result = {};
     if (mod != null) {
-      for (var k2 in mod) if (Object.hasOwnProperty.call(mod, k2)) result[k2] = mod[k2];
+      for (var k3 in mod) if (Object.hasOwnProperty.call(mod, k3)) result[k3] = mod[k3];
     }
     result["default"] = mod;
     return result;
@@ -103350,7 +103377,7 @@ function requireOpToHtmlConverter() {
       if (mod && mod.__esModule) return mod;
       var result = {};
       if (mod != null) {
-        for (var k2 in mod) if (Object.hasOwnProperty.call(mod, k2)) result[k2] = mod[k2];
+        for (var k3 in mod) if (Object.hasOwnProperty.call(mod, k3)) result[k3] = mod[k3];
       }
       result["default"] = mod;
       return result;
@@ -103508,8 +103535,8 @@ function requireOpToHtmlConverter() {
         }
         var makeAttr = this.makeAttr.bind(this);
         var customTagAttributes = this.getCustomTagAttributes();
-        var customAttr = customTagAttributes ? Object.keys(this.getCustomTagAttributes()).map(function(k2) {
-          return makeAttr(k2, customTagAttributes[k2]);
+        var customAttr = customTagAttributes ? Object.keys(this.getCustomTagAttributes()).map(function(k3) {
+          return makeAttr(k3, customTagAttributes[k3]);
         }) : [];
         var classes = this.getCssClasses();
         var tagAttrs = classes.length ? customAttr.concat([makeAttr("class", classes.join(" "))]) : customAttr;
@@ -103556,8 +103583,8 @@ function requireOpToHtmlConverter() {
         }
         return tagAttrs;
       };
-      OpToHtmlConverter2.prototype.makeAttr = function(k2, v2) {
-        return { key: k2, value: v2 };
+      OpToHtmlConverter2.prototype.makeAttr = function(k3, v2) {
+        return { key: k3, value: v2 };
       };
       OpToHtmlConverter2.prototype.getLinkAttrs = function() {
         var tagAttrs = [];
@@ -104003,7 +104030,7 @@ function requireQuillDeltaToHtmlConverter() {
     if (mod && mod.__esModule) return mod;
     var result = {};
     if (mod != null) {
-      for (var k2 in mod) if (Object.hasOwnProperty.call(mod, k2)) result[k2] = mod[k2];
+      for (var k3 in mod) if (Object.hasOwnProperty.call(mod, k3)) result[k3] = mod[k3];
     }
     result["default"] = mod;
     return result;
@@ -107354,7 +107381,8 @@ const WidgetMixin = {
     if (attr) return parseFieldsString(attr);
     let resource = this.resource;
     if ((_a3 = resource == null ? void 0 : resource.isContainer) == null ? void 0 : _a3.call(resource)) {
-      for (const res of resource["ldp:contains"]) {
+      const resources = resource["listPredicate"];
+      for (const res of resources) {
         resource = res;
         break;
       }
@@ -107455,7 +107483,7 @@ const WidgetMixin = {
       }
       if (fieldValue === null || fieldValue === void 0 || fieldValue === "")
         return void 0;
-      if (Array.isArray(fieldValue) && !fieldValue["ldp:contains"]) {
+      if (Array.isArray(fieldValue) && !doesResourceContainList(fieldValue)) {
         return JSON.stringify(fieldValue);
       }
       if (typeof fieldValue === "object" && fieldValue["@id"] && Object.keys(fieldValue).length === 1) {
@@ -108157,10 +108185,7 @@ const SolidForm = {
     const value = this.value;
     if (this.resource && !((_b = (_a3 = this.resource).isContainer) == null ? void 0 : _b.call(_a3))) {
       for (const predicate of Object.keys(this.value)) {
-        let object2 = await this.resource[predicate];
-        if (!object2) {
-          object2 = await this.resource[store.getExpandedPredicate(predicate, this.context)];
-        }
+        const object2 = await this.resource.getList(predicate);
         if ((object2 == null ? void 0 : object2["@id"]) && !value[predicate]["@id"])
           value[predicate]["@id"] = object2["@id"];
         if (object2 && !object2["@id"] && Array.isArray(object2) && value[predicate].length === 0 && object2.length > 0) {
@@ -109506,13 +109531,14 @@ class BaseWidget extends HTMLElement {
   }
   async fetchSources(resource) {
     var _a3;
-    if (!resource || !resource["ldp:contains"]) return null;
+    const data = resource["listPredicate"];
+    if (!data) return null;
     const resources = [];
     let index2 = 0;
-    for (let res of resource["ldp:contains"]) {
+    for (let res of data) {
       if (!res) {
         try {
-          const resourceId = resource.getChildren("ldp:contains")[index2]["@id"];
+          const resourceId = data[index2]["@id"];
           res = await store.getData(resourceId, this.context);
         } catch {
           continue;
@@ -109524,8 +109550,9 @@ class BaseWidget extends HTMLElement {
           this.context
         );
         this._listen(res["@id"]);
-        if (resourcesFromContainer)
-          resources.push(...resourcesFromContainer["ldp:contains"]);
+        if (resourcesFromContainer) {
+          resources.push(...resourcesFromContainer["listPredicate"]);
+        }
       } else {
         resources.push(res);
       }
@@ -109544,7 +109571,7 @@ class BaseWidget extends HTMLElement {
       let selected;
       if ((_b = (_a3 = this._value) == null ? void 0 : _a3.isContainer) == null ? void 0 : _b.call(_a3)) {
         selected = false;
-        for await (const value of this._value["ldp:contains"]) {
+        for await (const value of this._value["listPredicate"]) {
           if (value["@id"] === element["@id"]) {
             selected = true;
             break;
@@ -109649,7 +109676,7 @@ export {
   FederationMixin,
   FilterMixin,
   GrouperMixin,
-  j as Helpers,
+  k as Helpers,
   HighlighterMixin,
   ListMixin,
   NextMixin,