@domql/element 2.5.120 → 2.5.122

package/create.js

@@ -214,8 +214,7 @@ const addElementIntoParentChildren = (element, parent) => {
 const visitedElements = new WeakMap()
 const renderElement = (element, parent, options, attachOptions) => {
   if (visitedElements.has(element)) {
-    console.warn('Cyclic rendering detected:', element)
-    return
+    if (ENV === 'test' || ENV === 'development') console.warn('Cyclic rendering detected:', element.__ref.__path)
   }
 
   visitedElements.set(element, true)
@@ -224,8 +223,8 @@ const renderElement = (element, parent, options, attachOptions) => {
 
   // CREATE a real NODE
   try {
-    const isInfiniteLoop = detectInfiniteLoop(ref.__path)
-    if (ref.__uniqId || isInfiniteLoop) return
+    const isInfiniteLoopDetected = detectInfiniteLoop(ref.__path)
+    if (ref.__uniqId || isInfiniteLoopDetected) return
     createNode(element, options)
     ref.__uniqId = Math.random()
   } catch (e) {

package/dist/cjs/create.js

@@ -170,14 +170,14 @@ const addElementIntoParentChildren = (element, parent) => {
 const visitedElements = /* @__PURE__ */ new WeakMap();
 const renderElement = (element, parent, options, attachOptions) => {
   if (visitedElements.has(element)) {
-    console.warn("Cyclic rendering detected:", element);
-    return;
+    if (ENV === "test" || ENV === "development")
+      console.warn("Cyclic rendering detected:", element.__ref.__path);
   }
   visitedElements.set(element, true);
   const { __ref: ref, key } = element;
   try {
-    const isInfiniteLoop = (0, import_component.detectInfiniteLoop)(ref.__path);
-    if (ref.__uniqId || isInfiniteLoop)
+    const isInfiniteLoopDetected = (0, import_component.detectInfiniteLoop)(ref.__path);
+    if (ref.__uniqId || isInfiniteLoopDetected)
       return;
     (0, import_node.default)(element, options);
     ref.__uniqId = Math.random();

package/dist/cjs/update.js

@@ -53,25 +53,25 @@ const UPDATE_DEFAULT_OPTIONS = {
   calleeElement: false,
   excludes: import_utils2.METHODS_EXL
 };
-const update = function(params = {}, opts = UPDATE_DEFAULT_OPTIONS) {
-  const calleeElementCache = opts.calleeElement;
-  const options = (0, import_utils2.deepClone)((0, import_utils2.deepMerge)(opts, UPDATE_DEFAULT_OPTIONS), ["calleeElement"]);
+const update = function(params = {}, opts) {
+  const calleeElementCache = opts == null ? void 0 : opts.calleeElement;
+  const options = (0, import_utils2.deepClone)((0, import_utils.isObject)(opts) ? (0, import_utils2.deepMerge)(opts, UPDATE_DEFAULT_OPTIONS) : UPDATE_DEFAULT_OPTIONS, ["calleeElement"]);
   options.calleeElement = calleeElementCache;
   const element = this;
   const { parent, node, key } = element;
   const { excludes, preventInheritAtCurrentState } = options;
-  if (!options.preventListeners)
-    (0, import_event.triggerEventOnUpdate)("startUpdate", params, element, options);
-  if (preventInheritAtCurrentState && preventInheritAtCurrentState.__element === element)
-    return;
-  if (!excludes)
-    (0, import_utils.merge)(options, UPDATE_DEFAULT_OPTIONS);
   let ref = element.__ref;
   if (!ref)
     ref = element.__ref = {};
   const [snapshotOnCallee, calleeElement, snapshotHasUpdated] = captureSnapshot(element, options);
   if (snapshotHasUpdated)
     return;
+  if (!options.preventListeners)
+    (0, import_event.triggerEventOnUpdate)("startUpdate", params, element, options);
+  if (preventInheritAtCurrentState && preventInheritAtCurrentState.__element === element)
+    return;
+  if (!excludes)
+    (0, import_utils.merge)(options, UPDATE_DEFAULT_OPTIONS);
   if ((0, import_utils.isString)(params) || (0, import_utils.isNumber)(params)) {
     params = { text: params };
   }
@@ -129,6 +129,9 @@ const update = function(params = {}, opts = UPDATE_DEFAULT_OPTIONS) {
   }
   for (const param in element) {
     const prop = element[param];
+    if (element.Iframe && element.Overlay && element.ComponentFrameCanvas && param === "Iframe") {
+      console.log("isframe");
+    }
     if (!Object.hasOwnProperty.call(element, param))
       continue;
     const hasOnlyUpdateFalsy = onlyUpdate && (onlyUpdate !== param || !element.lookup(onlyUpdate));
@@ -166,7 +169,7 @@ const captureSnapshot = (element, options) => {
     ref.__currentSnapshot = createdStanpshot;
     return [createdStanpshot, element];
   }
-  const snapshotOnCallee = ref.__currentSnapshot;
+  const snapshotOnCallee = calleeElement.__ref.__currentSnapshot;
   if (currentSnapshot < snapshotOnCallee) {
     return [snapshotOnCallee, calleeElement, true];
   }
@@ -261,7 +264,7 @@ const createStateUpdate = (element, parent, options) => {
   for (const child in __stateChildren) {
     if (newState[child])
       newState.__children[child] = __stateChildren[child];
-    __stateChildren[child].parent = newState;
+    Object.getPrototypeOf(__stateChildren[child]).parent = newState;
   }
   return newState;
 };

package/dist/cjs/utils/component.js

@@ -175,22 +175,24 @@ const applyVariant = (element) => {
   });
   return element;
 };
-const detectInfiniteLoop = (actions) => {
+const detectInfiniteLoop = (arr) => {
   const maxRepeats = 10;
   let pattern = [];
   let repeatCount = 0;
-  for (let i = 0; i < actions.length; i++) {
+  for (let i = 0; i < arr.length; i++) {
     if (pattern.length < 2) {
-      pattern.push(actions[i]);
+      pattern.push(arr[i]);
     } else {
-      if (actions[i] === pattern[i % 2]) {
+      if (arr[i] === pattern[i % 2]) {
         repeatCount++;
       } else {
-        pattern = [actions[i]];
-        repeatCount = 0;
+        pattern = [arr[i - 1], arr[i]];
+        repeatCount = 1;
       }
-      if (repeatCount > maxRepeats * 2) {
-        console.warn("Warning: Potential infinite loop detected due to repeated sequence:", pattern);
+      if (repeatCount >= maxRepeats * 2) {
+        if (ENV === "test" || ENV === "development") {
+          console.warn("Warning: Potential infinite loop detected due to repeated sequence:", pattern);
+        }
         return true;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.120",
+  "version": "2.5.122",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "ca99941529086268c7c106229ef1873faf5ac54c",
+  "gitHead": "2f048372ece4d808cfaca8e43491611dafe3ad5f",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/update.js

@@ -39,25 +39,24 @@ const UPDATE_DEFAULT_OPTIONS = {
   excludes: METHODS_EXL
 }
 
-const update = function (params = {}, opts = UPDATE_DEFAULT_OPTIONS) {
-  const calleeElementCache = opts.calleeElement
-  const options = deepClone(deepMerge(opts, UPDATE_DEFAULT_OPTIONS), ['calleeElement'])
+const update = function (params = {}, opts) {
+  const calleeElementCache = opts?.calleeElement
+  const options = deepClone(isObject(opts) ? deepMerge(opts, UPDATE_DEFAULT_OPTIONS) : UPDATE_DEFAULT_OPTIONS, ['calleeElement'])
   options.calleeElement = calleeElementCache
   const element = this
   const { parent, node, key } = element
   const { excludes, preventInheritAtCurrentState } = options
 
-  if (!options.preventListeners) triggerEventOnUpdate('startUpdate', params, element, options)
-
-  if (preventInheritAtCurrentState && preventInheritAtCurrentState.__element === element) return
-  if (!excludes) merge(options, UPDATE_DEFAULT_OPTIONS)
-
   let ref = element.__ref
   if (!ref) ref = element.__ref = {}
-
   const [snapshotOnCallee, calleeElement, snapshotHasUpdated] = captureSnapshot(element, options)
   if (snapshotHasUpdated) return
 
+  if (!options.preventListeners) triggerEventOnUpdate('startUpdate', params, element, options)
+
+  if (preventInheritAtCurrentState && preventInheritAtCurrentState.__element === element) return
+  if (!excludes) merge(options, UPDATE_DEFAULT_OPTIONS)
+
   if (isString(params) || isNumber(params)) {
     params = { text: params }
   }
@@ -113,6 +112,10 @@ const update = function (params = {}, opts = UPDATE_DEFAULT_OPTIONS) {
   for (const param in element) {
     const prop = element[param]
 
+    if (element.Iframe && element.Overlay && element.ComponentFrameCanvas && param === 'Iframe') {
+      console.log('isframe')
+    }
+
     if (!Object.hasOwnProperty.call(element, param)) continue
 
     const hasOnlyUpdateFalsy = onlyUpdate && (onlyUpdate !== param || !element.lookup(onlyUpdate))
@@ -166,7 +169,8 @@ const captureSnapshot = (element, options) => {
     return [createdStanpshot, element]
   }
 
-  const snapshotOnCallee = ref.__currentSnapshot
+  const snapshotOnCallee = calleeElement.__ref.__currentSnapshot
+
   if (currentSnapshot < snapshotOnCallee) {
     return [snapshotOnCallee, calleeElement, true]
   }
@@ -297,7 +301,8 @@ const createStateUpdate = (element, parent, options) => {
   for (const child in __stateChildren) {
     // check this for inherited states
     if (newState[child]) newState.__children[child] = __stateChildren[child]
-    __stateChildren[child].parent = newState
+    // __stateChildren[child].parent = newState
+    Object.getPrototypeOf(__stateChildren[child]).parent = newState
   }
   return newState
 }

package/utils/component.js

@@ -166,28 +166,30 @@ export const applyVariant = (element) => {
   return element
 }
 
-export const detectInfiniteLoop = (actions) => {
+export const detectInfiniteLoop = arr => {
   const maxRepeats = 10 // Maximum allowed repetitions
   let pattern = []
   let repeatCount = 0
 
-  for (let i = 0; i < actions.length; i++) {
+  for (let i = 0; i < arr.length; i++) {
     if (pattern.length < 2) {
       // Build the initial pattern with two consecutive elements
-      pattern.push(actions[i])
+      pattern.push(arr[i])
     } else {
       // Check if the current element follows the repeating pattern
-      if (actions[i] === pattern[i % 2]) {
+      if (arr[i] === pattern[i % 2]) {
         repeatCount++
       } else {
         // If there's a mismatch, reset the pattern and repeat counter
-        pattern = [actions[i]]
-        repeatCount = 0
+        pattern = [arr[i - 1], arr[i]]
+        repeatCount = 1 // Reset to 1 because we start a new potential pattern
       }
 
-      // If the pattern has repeated more than `maxRepeats` times, throw a warning
-      if (repeatCount > maxRepeats * 2) { // *2 because it increments for both "Hgroup" and "content"
-        console.warn('Warning: Potential infinite loop detected due to repeated sequence:', pattern)
+      // If the pattern repeats more than `maxRepeats`, throw a warning
+      if (repeatCount >= maxRepeats * 2) {
+        if (ENV === 'test' || ENV === 'development') {
+          console.warn('Warning: Potential infinite loop detected due to repeated sequence:', pattern)
+        }
         return true
       }
     }