@startinblox/boilerplate 6.0.5 → 6.0.7

package/dist/index.js

@@ -675,12 +675,12 @@ class _ extends lt {
     document.readyState === "complete" ? r() : document.addEventListener("readystatechange", r);
   }
   async _attach(t, e, i) {
-    if (!this.orbit && window.orbit && (this.orbit = window.orbit, e)) {
-      if (Ae({
+    if (!this.orbit && window.orbit) {
+      if (this.orbit = window.orbit, e && (Ae({
         component: this,
         defaultRoute: t,
         ignoreRouter: i
-      }), this.route && (this.component = this.orbit.getComponentFromRoute(this.route), this.component))
+      }), this.route && (this.component = this.orbit.getComponentFromRoute(this.route), this.component)))
         for (const r of this.orbit.components)
           r.uniq === this.component.uniq && (r.instance = this);
       return await this._afterAttach(), this.ready = !0, this.dispatchEvent(
@@ -745,10 +745,10 @@ class _ extends lt {
       l !== void 0 && (o[a.value] = l);
     return await this._responseAdaptator(o);
   }
-  async _hasCherryPickedProperties(t) {
-    const e = await t.properties;
-    for (const i of this.cherryPickedProperties)
-      if (e?.includes(i.key))
+  async _hasCherryPickedProperties(t, e = this.cherryPickedProperties) {
+    const i = await t.properties;
+    for (const r of e)
+      if (i?.includes(r.key))
         return !0;
     return !1;
   }
@@ -759,7 +759,7 @@ class _ extends lt {
       if (typeof t == "string" ? r = await window.sibStore.getData(t, wt) : t.isFullResource && !t.isFullResource?.() && (r = await window.sibStore.getData(t["@id"], wt)), !r) return { _originalResource: r };
       if (typeof r != "object" || r === null) return;
       if (r.isContainer?.() && r["ldp:contains"]) {
-        if (await this._hasCherryPickedProperties(r))
+        if (await this._hasCherryPickedProperties(r, i))
           return await this._getProperties(r, e, i);
         const o = this._normalizeLdpContains(await r["ldp:contains"]);
         return await this._expandContainer(o, e, i);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startinblox/boilerplate",
-  "version": "6.0.5",
+  "version": "6.0.7",
   "description": "Startin'blox Boilerplate",
   "main": "dist/index.js",
   "type": "module",

package/src/helpers/components/orbitComponent.ts

@@ -98,20 +98,19 @@ export default class extends ComponentObjectsHandler {
               }
             }
           }
-
-          await this._afterAttach();
-
-          this.ready = true;
-          this.dispatchEvent(
-            new CustomEvent("component-ready", {
-              detail: {
-                component: this.component,
-              },
-            }),
-          );
-
-          return Promise.resolve(true);
         }
+        await this._afterAttach();
+
+        this.ready = true;
+        this.dispatchEvent(
+          new CustomEvent("component-ready", {
+            detail: {
+              component: this.component,
+            },
+          }),
+        );
+
+        return Promise.resolve(true);
       }
     }
     return Promise.resolve(false);
@@ -216,10 +215,13 @@ export default class extends ComponentObjectsHandler {
     return await this._responseAdaptator(response);
   }
 
-  async _hasCherryPickedProperties(resource: Resource) {
+  async _hasCherryPickedProperties(
+    resource: Resource,
+    targetProperties = this.cherryPickedProperties,
+  ) {
     const properties = await resource.properties;
 
-    for (const prop of this.cherryPickedProperties) {
+    for (const prop of targetProperties) {
       if (properties?.includes(prop.key)) {
         return true;
       }
@@ -252,7 +254,7 @@ export default class extends ComponentObjectsHandler {
       if (typeof target !== "object" || target === null) return;
 
       if (target.isContainer?.() && target["ldp:contains"]) {
-        if (await this._hasCherryPickedProperties(target)) {
+        if (await this._hasCherryPickedProperties(target, targetProperties)) {
           return await this._getProperties(target, recursive, targetProperties);
         }