@makeswift/runtime 0.2.19 → 0.2.21

package/dist/index.es.js

@@ -293,6 +293,7 @@ async function introspect(element, client, store) {
   const tableIds = /* @__PURE__ */ new Set();
   const pageIds = /* @__PURE__ */ new Set();
   const remaining = [element];
+  const seen = /* @__PURE__ */ new Set();
   let current;
   while (current = remaining.pop()) {
     let getResourcesFromElementDescriptors = function(elementDescriptors2, props) {
@@ -304,7 +305,12 @@ async function introspect(element, client, store) {
         getTypographyIds(descriptor, props[propName]).forEach((typographyId) => typographyIds.add(typographyId));
         getTableIds(descriptor, props[propName]).forEach((tableId) => tableIds.add(tableId));
         getPageIds(descriptor, props[propName]).forEach((pageId) => pageIds.add(pageId));
-        getElementChildren(descriptor, props[propName]).forEach((child) => remaining.push(child));
+        getElementChildren(descriptor, props[propName]).forEach((child) => {
+          if (!seen.has(child.key)) {
+            seen.add(child.key);
+            remaining.push(child);
+          }
+        });
         if (descriptor.type === ShapeControlType) {
           const prop = props[propName];
           if (prop == null)
@@ -972,7 +978,7 @@ class Document$1 extends NextDocument {
     });
   }
 }
-const version = "0.2.19";
+const version = "0.2.21";
 function isErrorWithMessage(error) {
   return typeof error === "object" && error !== null && "message" in error && typeof error.message === "string";
 }
@@ -1218,7 +1224,7 @@ const Page = memo(({
     rootElements: /* @__PURE__ */ new Map([[snapshot.document.id, snapshot.document.data]]),
     children: /* @__PURE__ */ jsx(Page$1, {
       document: snapshot.document
-    })
+    }, snapshot.document.data.key)
   });
 });
 const keys = (o) => Object.keys(o);
@@ -3333,6 +3339,7 @@ const DocumentContext = createContext(null);
 function useDocumentKey() {
   return useContext(DocumentContext);
 }
+const DocumentCyclesContext = createContext([]);
 function useStore() {
   return useContext(Context);
 }
@@ -3410,6 +3417,9 @@ const ElementReference = memo(forwardRef(function ElementReference2({
   });
   const globalElementData = (_a = data == null ? void 0 : data.globalElement) == null ? void 0 : _a.data;
   const elementReferenceDocument = useDocument(elementReference.key);
+  const documentKey = elementReference.key;
+  const documentKeys = useContext(DocumentCyclesContext);
+  const providedDocumentKeys = useMemo(() => [...documentKeys, documentKey], [documentKeys, documentKey]);
   if (error != null) {
     return /* @__PURE__ */ jsx(FallbackComponent, {
       ref,
@@ -3422,14 +3432,23 @@ const ElementReference = memo(forwardRef(function ElementReference2({
       text: "This global component doesn't exist"
     });
   }
-  return elementReferenceDocument != null ? /* @__PURE__ */ jsx(Document, {
-    document: elementReferenceDocument,
-    ref
-  }) : /* @__PURE__ */ jsx(DisableRegisterElement.Provider, {
-    value: true,
-    children: /* @__PURE__ */ jsx(ElementData, {
-      elementData: globalElementData,
+  if (documentKeys.includes(documentKey)) {
+    return /* @__PURE__ */ jsx(FallbackComponent, {
+      ref,
+      text: "This global component contains itself!"
+    });
+  }
+  return /* @__PURE__ */ jsx(DocumentCyclesContext.Provider, {
+    value: providedDocumentKeys,
+    children: elementReferenceDocument != null ? /* @__PURE__ */ jsx(Document, {
+      document: elementReferenceDocument,
       ref
+    }) : /* @__PURE__ */ jsx(DisableRegisterElement.Provider, {
+      value: true,
+      children: /* @__PURE__ */ jsx(ElementData, {
+        elementData: globalElementData,
+        ref
+      })
     })
   });
 }));