@domql/utils 3.1.2 → 3.2.3

package/dist/cjs/element.js

@@ -35,7 +35,7 @@ var import_node = require("./node.js");
 var import_props = require("./props.js");
 var import_tags = require("./tags.js");
 var import_types = require("./types.js");
-const ENV = "development";
+const ENV = process.env.NODE_ENV;
 const returnValueAsText = (element, parent, key) => {
   const childExtendsTag = parent.childExtends && parent.childExtends.tag;
   const childPropsTag = parent.props.childProps && parent.props.childProps.tag;

package/dist/cjs/env.js

@@ -31,7 +31,7 @@ __export(env_exports, {
 });
 module.exports = __toCommonJS(env_exports);
 // @preserve-env
-const NODE_ENV = "development";
+const NODE_ENV = process.env.NODE_ENV;
 const ENV = NODE_ENV;
 const isProduction = (env = NODE_ENV) => env === "production";
 const isTest = (env = NODE_ENV) => env === "testing" || env === "test";

package/dist/cjs/events.js

@@ -29,9 +29,9 @@ function addEventFromProps(key, obj) {
   const origEvent = on[eventName];
   const funcFromProps = props[key];
   if ((0, import_types.isFunction)(origEvent)) {
-    on[eventName] = async (...args) => {
-      const originalEventRetunrs = await origEvent(...args);
-      if (originalEventRetunrs !== false) await funcFromProps(...args);
+    on[eventName] = (...args) => {
+      const originalEventRetunrs = origEvent(...args);
+      if (originalEventRetunrs !== false) funcFromProps(...args);
     };
   } else on[eventName] = funcFromProps;
 }

package/dist/cjs/extends.js

@@ -51,7 +51,7 @@ var import_array = require("./array.js");
 var import_component = require("./component.js");
 var import_object = require("./object.js");
 var import_types = require("./types.js");
-const ENV = "development";
+const ENV = process.env.NODE_ENV;
 const createExtendsFromKeys = (key) => {
   if (key.includes("+")) {
     return key.split("+").filter(import_component.matchesComponentNaming);

package/dist/cjs/keys.js

@@ -38,6 +38,7 @@ const DOMQ_PROPERTIES = [
   "classlist",
   "state",
   "scope",
+  "root",
   "deps",
   "extends",
   "$router",
@@ -78,8 +79,7 @@ const PARSED_DOMQ_PROPERTIES = [
   "key",
   "tag",
   "query",
-  "on",
-  "context"
+  "on"
 ];
 const STATE_PROPERTIES = [
   "ref",

package/dist/cjs/methods.js

@@ -22,6 +22,7 @@ __export(methods_exports, {
   defineSetter: () => defineSetter,
   error: () => error,
   get: () => get,
+  getChildren: () => getChildren,
   getPath: () => getPath,
   getRef: () => getRef,
   isMethod: () => isMethod,
@@ -49,7 +50,7 @@ var import_types = require("./types.js");
 var import_object = require("./object.js");
 var import_env = require("./env.js");
 var import_array = require("./array.js");
-const ENV = "development";
+const ENV = process.env.NODE_ENV;
 function spotByPath(path) {
   const element = this;
   const { __ref: ref } = element;
@@ -87,7 +88,8 @@ function lookdown(param) {
   var _a;
   const el = this;
   const { __ref: ref } = el;
-  const children = ref.__children;
+  const children = ref == null ? void 0 : ref.__children;
+  if (!children) return;
   for (let i = 0; i < children.length; i++) {
     const v = children[i];
     const childElem = el[v];
@@ -106,7 +108,8 @@ function lookdownAll(param, results = []) {
   var _a;
   const el = this;
   const { __ref: ref } = el;
-  const children = ref.__children;
+  const children = ref == null ? void 0 : ref.__children;
+  if (!children) return;
   for (let i = 0; i < children.length; i++) {
     const v = children[i];
     const childElem = el[v];
@@ -159,9 +162,14 @@ function setProps(param, options) {
   element.update({ props: param }, options);
   return element;
 }
-function getRef() {
+function getRef(key) {
+  if (key) return this.__ref && this.__ref[key];
   return this.__ref;
 }
+function getChildren() {
+  const __children = this.getRef("__children");
+  return __children.map((k) => this[k]);
+}
 function getPath() {
   return this.getRef().path;
 }
@@ -182,32 +190,43 @@ function keys() {
 }
 function parse(excl = []) {
   const element = this;
-  const { __ref: ref } = element;
   const obj = {};
   const keyList = keys.call(element);
+  const hasChildren = keyList.includes("children");
   keyList.forEach((v) => {
-    if (excl.includes(v)) return;
+    if (excl.includes(v) || !Object.hasOwnProperty.call(element, v)) return;
+    if (hasChildren && v === "content") return;
     const val = element[v];
     if (v === "state") {
-      if (!(ref == null ? void 0 : ref.__hasRootState)) return;
+      if (element.__ref && !element.__ref.__hasRootState) return;
       const parsedVal = (0, import_types.isFunction)(val && val.parse) ? val.parse() : val;
       obj[v] = (0, import_types.isFunction)(parsedVal) ? parsedVal : JSON.parse(JSON.stringify(parsedVal || {}));
     } else if (v === "scope") {
-      if (!(ref == null ? void 0 : ref.__hasRootScope)) return;
+      if (element.__ref && !element.__ref.__hasRootScope) return;
       obj[v] = JSON.parse(JSON.stringify(val || {}));
+    } else if (v === "props") {
+      const { __element, update, ...props } = element[v];
+      obj[v] = props;
     } else if ((0, import_types.isDefined)(val) && Object.hasOwnProperty.call(element, v)) {
       obj[v] = val;
     }
   });
   return obj;
 }
-function parseDeep(excl = []) {
+function parseDeep(excl = [], visited = /* @__PURE__ */ new WeakSet()) {
   const element = this;
+  if (visited.has(element)) return void 0;
+  visited.add(element);
   const obj = parse.call(element, excl);
   for (const v in obj) {
-    if (excl.includes(v)) return;
-    if ((0, import_types.isObjectLike)(obj[v])) {
-      obj[v] = parseDeep.call(obj[v], excl);
+    if (excl.includes(v) || !Object.hasOwnProperty.call(element, v)) continue;
+    const val = obj[v];
+    if (Array.isArray(val)) {
+      obj[v] = val.map(
+        (item) => (0, import_types.isObjectLike)(item) ? parseDeep.call(item, excl, visited) : item
+      );
+    } else if ((0, import_types.isObjectLike)(val)) {
+      obj[v] = parseDeep.call(val, excl, visited);
     }
   }
   return obj;

package/dist/cjs/object.js

@@ -29,7 +29,6 @@ __export(object_exports, {
   detectInfiniteLoop: () => detectInfiniteLoop,
   excludeKeysFromObject: () => excludeKeysFromObject,
   exec: () => exec,
-  execPromise: () => execPromise,
   getInObjectByPath: () => getInObjectByPath,
   hasFunction: () => hasFunction,
   hasOwnProperty: () => hasOwnProperty,
@@ -56,26 +55,23 @@ var import_array = require("./array.js");
 var import_string = require("./string.js");
 var import_node = require("./node.js");
 var import_keys = require("./keys.js");
-const ENV = "development";
+const ENV = process.env.NODE_ENV;
 const exec = (param, element, state, context) => {
   if ((0, import_types.isFunction)(param)) {
-    return param.call(
-      element,
-      element,
-      state || element.state,
-      context || element.context
-    );
-  }
-  return param;
-};
-const execPromise = async (param, element, state, context) => {
-  if ((0, import_types.isFunction)(param)) {
-    return await param.call(
+    const result = param.call(
       element,
       element,
       state || element.state,
       context || element.context
     );
+    if (result && typeof result.then === "function") {
+      let resolved;
+      result.then((value) => {
+        resolved = value;
+      });
+      return resolved;
+    }
+    return result;
   }
   return param;
 };
@@ -134,13 +130,14 @@ const deepClone = (obj, options = {}) => {
     visited = /* @__PURE__ */ new WeakMap(),
     handleExtends = false
   } = options;
+  const contentWindow = targetWindow || import_globals.window || globalThis;
   if (!(0, import_types.isObjectLike)(obj) || (0, import_node.isDOMNode)(obj)) {
     return obj;
   }
   if (visited.has(obj)) {
     return visited.get(obj);
   }
-  const clone2 = targetWindow ? (0, import_types.isArray)(obj) ? new targetWindow.Array() : new targetWindow.Object() : (0, import_types.isArray)(obj) ? [] : {};
+  const clone2 = contentWindow ? (0, import_types.isArray)(obj) ? new contentWindow.Array() : new contentWindow.Object() : (0, import_types.isArray)(obj) ? [] : {};
   visited.set(obj, clone2);
   for (const key in obj) {
     if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
@@ -159,8 +156,8 @@ const deepClone = (obj, options = {}) => {
       clone2[key] = (0, import_array.unstackArrayOfObjects)(value, exclude);
       continue;
     }
-    if ((0, import_types.isFunction)(value) && targetWindow) {
-      clone2[key] = targetWindow.eval("(" + value.toString() + ")");
+    if ((0, import_types.isFunction)(value) && options.window) {
+      clone2[key] = contentWindow.eval("(" + value.toString() + ")");
       continue;
     }
     if ((0, import_types.isObjectLike)(value)) {

package/dist/cjs/props.js

@@ -135,9 +135,9 @@ const inheritParentProps = (element, parent) => {
   }
   return propsStack;
 };
-async function update(props, options) {
+function update(props, options) {
   const element = this.__element;
-  await element.update({ props }, options);
+  element.update({ props }, options);
 }
 function setPropsPrototype(element) {
   const methods = { update: update.bind(element.props), __element: element };

package/dist/cjs/state.js

@@ -35,12 +35,12 @@ var import_array = require("./array.js");
 var import_keys = require("./keys.js");
 var import_object = require("./object.js");
 var import_types = require("./types.js");
-const checkForStateTypes = async (element) => {
+const checkForStateTypes = (element) => {
   const { state: orig, props, __ref: ref } = element;
   const state = (props == null ? void 0 : props.state) || orig;
   if ((0, import_types.isFunction)(state)) {
     ref.__state = state;
-    return await (0, import_object.execPromise)(state, element);
+    return (0, import_object.exec)(state, element);
   } else if ((0, import_types.is)(state)("string", "number")) {
     ref.__state = state;
     return { value: state };
@@ -141,9 +141,9 @@ const createNestedObjectByKeyPath = (path, value) => {
   });
   return obj;
 };
-const applyDependentState = async (element, state) => {
+const applyDependentState = (element, state) => {
   const { __element } = state;
-  const origState = await (0, import_object.execPromise)(__element == null ? void 0 : __element.state, element);
+  const origState = (0, import_object.exec)(__element == null ? void 0 : __element.state, element);
   if (!origState) return;
   const dependentState = (0, import_object.deepClone)(origState, import_keys.STATE_METHODS);
   const newDepends = { [element.key]: dependentState };

package/dist/cjs/tags.js

@@ -23,18 +23,8 @@ __export(tags_exports, {
 });
 module.exports = __toCommonJS(tags_exports);
 const HTML_TAGS = {
-  root: [
-    "body",
-    "html"
-  ],
-  head: [
-    "title",
-    "base",
-    "meta",
-    "style",
-    "noscript",
-    "script"
-  ],
+  root: ["body", "html"],
+  head: ["title", "base", "meta", "style", "noscript", "script"],
   body: [
     "string",
     "style",

package/dist/esm/element.js

@@ -23,7 +23,7 @@ import { isNode } from "./node.js";
 import { createProps } from "./props.js";
 import { HTML_TAGS } from "./tags.js";
 import { is, isFunction } from "./types.js";
-const ENV = "development";
+const ENV = process.env.NODE_ENV;
 const returnValueAsText = (element, parent, key) => {
   const childExtendsTag = parent.childExtends && parent.childExtends.tag;
   const childPropsTag = parent.props.childProps && parent.props.childProps.tag;

package/dist/esm/env.js

@@ -1,5 +1,5 @@
 // @preserve-env
-const NODE_ENV = "development";
+const NODE_ENV = process.env.NODE_ENV;
 const ENV = NODE_ENV;
 const isProduction = (env = NODE_ENV) => env === "production";
 const isTest = (env = NODE_ENV) => env === "testing" || env === "test";

package/dist/esm/events.js

@@ -6,9 +6,9 @@ function addEventFromProps(key, obj) {
   const origEvent = on[eventName];
   const funcFromProps = props[key];
   if (isFunction(origEvent)) {
-    on[eventName] = async (...args) => {
-      const originalEventRetunrs = await origEvent(...args);
-      if (originalEventRetunrs !== false) await funcFromProps(...args);
+    on[eventName] = (...args) => {
+      const originalEventRetunrs = origEvent(...args);
+      if (originalEventRetunrs !== false) funcFromProps(...args);
     };
   } else on[eventName] = funcFromProps;
 }

package/dist/esm/extends.js

@@ -21,7 +21,7 @@ import { joinArrays, removeDuplicatesInArray } from "./array.js";
 import { matchesComponentNaming } from "./component.js";
 import { deepClone, exec } from "./object.js";
 import { isArray, isObject, isString } from "./types.js";
-const ENV = "development";
+const ENV = process.env.NODE_ENV;
 const createExtendsFromKeys = (key) => {
   if (key.includes("+")) {
     return key.split("+").filter(matchesComponentNaming);

package/dist/esm/keys.js

@@ -8,6 +8,7 @@ const DOMQ_PROPERTIES = [
   "classlist",
   "state",
   "scope",
+  "root",
   "deps",
   "extends",
   "$router",
@@ -48,8 +49,7 @@ const PARSED_DOMQ_PROPERTIES = [
   "key",
   "tag",
   "query",
-  "on",
-  "context"
+  "on"
 ];
 const STATE_PROPERTIES = [
   "ref",

package/dist/esm/methods.js

@@ -1,10 +1,25 @@
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 import { triggerEventOn } from "@domql/event";
 import { DOMQ_PROPERTIES, METHODS, PARSED_DOMQ_PROPERTIES } from "./keys.js";
 import { isDefined, isFunction, isObject, isObjectLike } from "./types.js";
 import { deepClone } from "./object.js";
 import { isProduction } from "./env.js";
 import { removeValueFromArray } from "./array.js";
-const ENV = "development";
+const ENV = process.env.NODE_ENV;
 function spotByPath(path) {
   const element = this;
   const { __ref: ref } = element;
@@ -42,7 +57,8 @@ function lookdown(param) {
   var _a;
   const el = this;
   const { __ref: ref } = el;
-  const children = ref.__children;
+  const children = ref == null ? void 0 : ref.__children;
+  if (!children) return;
   for (let i = 0; i < children.length; i++) {
     const v = children[i];
     const childElem = el[v];
@@ -61,7 +77,8 @@ function lookdownAll(param, results = []) {
   var _a;
   const el = this;
   const { __ref: ref } = el;
-  const children = ref.__children;
+  const children = ref == null ? void 0 : ref.__children;
+  if (!children) return;
   for (let i = 0; i < children.length; i++) {
     const v = children[i];
     const childElem = el[v];
@@ -114,9 +131,14 @@ function setProps(param, options) {
   element.update({ props: param }, options);
   return element;
 }
-function getRef() {
+function getRef(key) {
+  if (key) return this.__ref && this.__ref[key];
   return this.__ref;
 }
+function getChildren() {
+  const __children = this.getRef("__children");
+  return __children.map((k) => this[k]);
+}
 function getPath() {
   return this.getRef().path;
 }
@@ -137,32 +159,43 @@ function keys() {
 }
 function parse(excl = []) {
   const element = this;
-  const { __ref: ref } = element;
   const obj = {};
   const keyList = keys.call(element);
+  const hasChildren = keyList.includes("children");
   keyList.forEach((v) => {
-    if (excl.includes(v)) return;
+    if (excl.includes(v) || !Object.hasOwnProperty.call(element, v)) return;
+    if (hasChildren && v === "content") return;
     const val = element[v];
     if (v === "state") {
-      if (!(ref == null ? void 0 : ref.__hasRootState)) return;
+      if (element.__ref && !element.__ref.__hasRootState) return;
       const parsedVal = isFunction(val && val.parse) ? val.parse() : val;
       obj[v] = isFunction(parsedVal) ? parsedVal : JSON.parse(JSON.stringify(parsedVal || {}));
     } else if (v === "scope") {
-      if (!(ref == null ? void 0 : ref.__hasRootScope)) return;
+      if (element.__ref && !element.__ref.__hasRootScope) return;
       obj[v] = JSON.parse(JSON.stringify(val || {}));
+    } else if (v === "props") {
+      const _a = element[v], { __element, update } = _a, props = __objRest(_a, ["__element", "update"]);
+      obj[v] = props;
     } else if (isDefined(val) && Object.hasOwnProperty.call(element, v)) {
       obj[v] = val;
     }
   });
   return obj;
 }
-function parseDeep(excl = []) {
+function parseDeep(excl = [], visited = /* @__PURE__ */ new WeakSet()) {
   const element = this;
+  if (visited.has(element)) return void 0;
+  visited.add(element);
   const obj = parse.call(element, excl);
   for (const v in obj) {
-    if (excl.includes(v)) return;
-    if (isObjectLike(obj[v])) {
-      obj[v] = parseDeep.call(obj[v], excl);
+    if (excl.includes(v) || !Object.hasOwnProperty.call(element, v)) continue;
+    const val = obj[v];
+    if (Array.isArray(val)) {
+      obj[v] = val.map(
+        (item) => isObjectLike(item) ? parseDeep.call(item, excl, visited) : item
+      );
+    } else if (isObjectLike(val)) {
+      obj[v] = parseDeep.call(val, excl, visited);
     }
   }
   return obj;
@@ -263,6 +296,7 @@ export {
   defineSetter,
   error,
   get,
+  getChildren,
   getPath,
   getRef,
   isMethod,

package/dist/esm/object.js

@@ -32,26 +32,23 @@ import { unstackArrayOfObjects } from "./array.js";
 import { stringIncludesAny } from "./string.js";
 import { isDOMNode } from "./node.js";
 import { METHODS_EXL } from "./keys.js";
-const ENV = "development";
+const ENV = process.env.NODE_ENV;
 const exec = (param, element, state, context) => {
   if (isFunction(param)) {
-    return param.call(
-      element,
-      element,
-      state || element.state,
-      context || element.context
-    );
-  }
-  return param;
-};
-const execPromise = async (param, element, state, context) => {
-  if (isFunction(param)) {
-    return await param.call(
+    const result = param.call(
       element,
       element,
       state || element.state,
       context || element.context
     );
+    if (result && typeof result.then === "function") {
+      let resolved;
+      result.then((value) => {
+        resolved = value;
+      });
+      return resolved;
+    }
+    return result;
   }
   return param;
 };
@@ -110,13 +107,14 @@ const deepClone = (obj, options = {}) => {
     visited = /* @__PURE__ */ new WeakMap(),
     handleExtends = false
   } = options;
+  const contentWindow = targetWindow || window || globalThis;
   if (!isObjectLike(obj) || isDOMNode(obj)) {
     return obj;
   }
   if (visited.has(obj)) {
     return visited.get(obj);
   }
-  const clone2 = targetWindow ? isArray(obj) ? new targetWindow.Array() : new targetWindow.Object() : isArray(obj) ? [] : {};
+  const clone2 = contentWindow ? isArray(obj) ? new contentWindow.Array() : new contentWindow.Object() : isArray(obj) ? [] : {};
   visited.set(obj, clone2);
   for (const key in obj) {
     if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
@@ -135,8 +133,8 @@ const deepClone = (obj, options = {}) => {
       clone2[key] = unstackArrayOfObjects(value, exclude);
       continue;
     }
-    if (isFunction(value) && targetWindow) {
-      clone2[key] = targetWindow.eval("(" + value.toString() + ")");
+    if (isFunction(value) && options.window) {
+      clone2[key] = contentWindow.eval("(" + value.toString() + ")");
       continue;
     }
     if (isObjectLike(value)) {
@@ -555,7 +553,6 @@ export {
   detectInfiniteLoop,
   excludeKeysFromObject,
   exec,
-  execPromise,
   getInObjectByPath,
   hasFunction,
   hasOwnProperty,

package/dist/esm/props.js

@@ -113,9 +113,9 @@ const inheritParentProps = (element, parent) => {
   }
   return propsStack;
 };
-async function update(props, options) {
+function update(props, options) {
   const element = this.__element;
-  await element.update({ props }, options);
+  element.update({ props }, options);
 }
 function setPropsPrototype(element) {
   const methods = { update: update.bind(element.props), __element: element };

package/dist/esm/state.js

@@ -22,7 +22,7 @@ import { STATE_METHODS } from "./keys.js";
 import {
   deepClone,
   deepMerge,
-  execPromise,
+  exec,
   overwriteDeep,
   overwriteShallow
 } from "./object.js";
@@ -34,12 +34,12 @@ import {
   isString,
   isUndefined
 } from "./types.js";
-const checkForStateTypes = async (element) => {
+const checkForStateTypes = (element) => {
   const { state: orig, props, __ref: ref } = element;
   const state = (props == null ? void 0 : props.state) || orig;
   if (isFunction(state)) {
     ref.__state = state;
-    return await execPromise(state, element);
+    return exec(state, element);
   } else if (is(state)("string", "number")) {
     ref.__state = state;
     return { value: state };
@@ -140,9 +140,9 @@ const createNestedObjectByKeyPath = (path, value) => {
   });
   return obj;
 };
-const applyDependentState = async (element, state) => {
+const applyDependentState = (element, state) => {
   const { __element } = state;
-  const origState = await execPromise(__element == null ? void 0 : __element.state, element);
+  const origState = exec(__element == null ? void 0 : __element.state, element);
   if (!origState) return;
   const dependentState = deepClone(origState, STATE_METHODS);
   const newDepends = { [element.key]: dependentState };

package/dist/esm/tags.js

@@ -1,16 +1,6 @@
 const HTML_TAGS = {
-  root: [
-    "body",
-    "html"
-  ],
-  head: [
-    "title",
-    "base",
-    "meta",
-    "style",
-    "noscript",
-    "script"
-  ],
+  root: ["body", "html"],
+  head: ["title", "base", "meta", "style", "noscript", "script"],
   body: [
     "string",
     "style",

package/events.js

@@ -9,9 +9,9 @@ export function addEventFromProps (key, obj) {
   const origEvent = on[eventName]
   const funcFromProps = props[key]
   if (isFunction(origEvent)) {
-    on[eventName] = async (...args) => {
-      const originalEventRetunrs = await origEvent(...args)
-      if (originalEventRetunrs !== false) await funcFromProps(...args)
+    on[eventName] = (...args) => {
+      const originalEventRetunrs = origEvent(...args)
+      if (originalEventRetunrs !== false) funcFromProps(...args)
     }
   } else on[eventName] = funcFromProps
 }

package/function.js

@@ -16,7 +16,8 @@
 export function debounce (func, wait, immediate) {
   let timeout
   return function () {
-    const context = this; const args = arguments
+    const context = this
+    const args = arguments
     const later = function () {
       timeout = null
       if (!immediate) func.apply(context, args)
@@ -46,11 +47,13 @@ export const debounceOnContext = (element, func, timeout = 300) => {
   let timer
   return (...args) => {
     clearTimeout(timer)
-    timer = setTimeout(() => { func.apply(element, args) }, timeout)
+    timer = setTimeout(() => {
+      func.apply(element, args)
+    }, timeout)
   }
 }
 
-export const memoize = (fn) => {
+export const memoize = fn => {
   const cache = {}
   return (...args) => {
     const n = args[0]

package/keys.js

@@ -10,6 +10,7 @@ export const DOMQ_PROPERTIES = [
   'classlist',
   'state',
   'scope',
+  'root',
   'deps',
   'extends',
   '$router',
@@ -51,8 +52,7 @@ export const PARSED_DOMQ_PROPERTIES = [
   'key',
   'tag',
   'query',
-  'on',
-  'context'
+  'on'
 ]
 
 export const STATE_PROPERTIES = [

package/log.js

@@ -3,7 +3,6 @@
 export const logIf = (bool, ...arg) => {
   if (bool) arg.map(v => console.log(v))
 }
-
 export const logGroupIf = (bool, key, ...arg) => {
   if (bool) {
     console.group(key)

package/methods.js

@@ -55,7 +55,9 @@ export function lookup (param) {
 export function lookdown (param) {
   const el = this
   const { __ref: ref } = el
-  const children = ref.__children
+  const children = ref?.__children
+
+  if (!children) return
 
   for (let i = 0; i < children.length; i++) {
     const v = children[i]
@@ -76,7 +78,9 @@ export function lookdown (param) {
 export function lookdownAll (param, results = []) {
   const el = this
   const { __ref: ref } = el
-  const children = ref.__children
+  const children = ref?.__children
+
+  if (!children) return
 
   for (let i = 0; i < children.length; i++) {
     const v = children[i]
@@ -138,10 +142,16 @@ export function setProps (param, options) {
   return element
 }
 
-export function getRef () {
+export function getRef (key) {
+  if (key) return this.__ref && this.__ref[key]
   return this.__ref
 }
 
+export function getChildren () {
+  const __children = this.getRef('__children')
+  return __children.map(k => this[k])
+}
+
 export function getPath () {
   return this.getRef().path
 }
@@ -174,21 +184,25 @@ export function keys () {
 
 export function parse (excl = []) {
   const element = this
-  const { __ref: ref } = element
   const obj = {}
   const keyList = keys.call(element)
+  const hasChildren = keyList.includes('children')
   keyList.forEach(v => {
-    if (excl.includes(v)) return
+    if (excl.includes(v) || !Object.hasOwnProperty.call(element, v)) return
+    if (hasChildren && v === 'content') return
     const val = element[v]
     if (v === 'state') {
-      if (!ref?.__hasRootState) return
+      if (element.__ref && !element.__ref.__hasRootState) return
       const parsedVal = isFunction(val && val.parse) ? val.parse() : val
       obj[v] = isFunction(parsedVal)
         ? parsedVal
         : JSON.parse(JSON.stringify(parsedVal || {}))
     } else if (v === 'scope') {
-      if (!ref?.__hasRootScope) return
+      if (element.__ref && !element.__ref.__hasRootScope) return
       obj[v] = JSON.parse(JSON.stringify(val || {}))
+    } else if (v === 'props') {
+      const { __element, update, ...props } = element[v]
+      obj[v] = props
     } else if (isDefined(val) && Object.hasOwnProperty.call(element, v)) {
       obj[v] = val
     }
@@ -196,13 +210,20 @@ export function parse (excl = []) {
   return obj
 }
 
-export function parseDeep (excl = []) {
+export function parseDeep (excl = [], visited = new WeakSet()) {
   const element = this
+  if (visited.has(element)) return undefined
+  visited.add(element)
   const obj = parse.call(element, excl)
   for (const v in obj) {
-    if (excl.includes(v)) return
-    if (isObjectLike(obj[v])) {
-      obj[v] = parseDeep.call(obj[v], excl)
+    if (excl.includes(v) || !Object.hasOwnProperty.call(element, v)) continue
+    const val = obj[v]
+    if (Array.isArray(val)) {
+      obj[v] = val.map(item =>
+        isObjectLike(item) ? parseDeep.call(item, excl, visited) : item
+      )
+    } else if (isObjectLike(val)) {
+      obj[v] = parseDeep.call(val, excl, visited)
     }
   }
   return obj
@@ -300,6 +321,15 @@ export function variables (obj = {}) {
   }
 }
 
+/**
+ * A unified call function that detects the calling context and adapts accordingly.
+ * - When called in an async context (with await), it fully resolves promises
+ * - When called in a sync context, it returns sync results directly and handles promises appropriately
+ *
+ * @param {string} fnKey - The name of the function to call
+ * @param {...any} args - Arguments to pass to the function
+ * @returns {any|Promise} - The result or a Promise to the result
+ */
 export function call (fnKey, ...args) {
   const context = this.context
   return (

package/object.js

@@ -20,24 +20,20 @@ const ENV = process.env.NODE_ENV
 
 export const exec = (param, element, state, context) => {
   if (isFunction(param)) {
-    return param.call(
-      element,
-      element,
-      state || element.state,
-      context || element.context
-    )
-  }
-  return param
-}
-
-export const execPromise = async (param, element, state, context) => {
-  if (isFunction(param)) {
-    return await param.call(
+    const result = param.call(
       element,
       element,
       state || element.state,
       context || element.context
     )
+    if (result && typeof result.then === 'function') {
+      let resolved
+      result.then(value => {
+        resolved = value
+      })
+      return resolved
+    }
+    return result
   }
   return param
 }
@@ -118,6 +114,8 @@ export const deepClone = (obj, options = {}) => {
     handleExtends = false
   } = options
 
+  const contentWindow = targetWindow || window || globalThis
+
   // Handle non-object types and special cases
   if (!isObjectLike(obj) || isDOMNode(obj)) {
     return obj
@@ -129,10 +127,10 @@ export const deepClone = (obj, options = {}) => {
   }
 
   // Create appropriate container based on type and window context
-  const clone = targetWindow
+  const clone = contentWindow
     ? isArray(obj)
-      ? new targetWindow.Array()
-      : new targetWindow.Object()
+      ? new contentWindow.Array()
+      : new contentWindow.Object()
     : isArray(obj)
     ? []
     : {}
@@ -172,8 +170,8 @@ export const deepClone = (obj, options = {}) => {
     }
 
     // Handle functions in cross-frame scenario
-    if (isFunction(value) && targetWindow) {
-      clone[key] = targetWindow.eval('(' + value.toString() + ')')
+    if (isFunction(value) && options.window) {
+      clone[key] = contentWindow.eval('(' + value.toString() + ')')
       continue
     }
 

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@domql/utils",
-  "version": "3.1.2",
+  "version": "3.2.3",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
   "main": "index.js",
   "exports": {
     ".": {
-      "default": "./index.js",
+      "default": "./dist/esm/index.js",
       "import": "./dist/esm/index.js",
       "require": "./dist/cjs/index.js"
     }
@@ -19,12 +19,12 @@
   ],
   "scripts": {
     "copy:package:cjs": "cp ../../build/package-cjs.json dist/cjs/package.json",
-    "build:esm": "npx esbuild *.js --target=es2017 --format=esm --outdir=dist/esm",
-    "build:cjs": "npx esbuild *.js --target=node16 --format=cjs --outdir=dist/cjs",
+    "build:esm": "npx cross-env NODE_ENV=$NODE_ENV npx esbuild *.js --target=es2017 --format=esm --outdir=dist/esm --define:process.env.NODE_ENV=process.env.NODE_ENV",
+    "build:cjs": "npx cross-env NODE_ENV=$NODE_ENV npx esbuild *.js --target=node16 --format=cjs --outdir=dist/cjs --define:process.env.NODE_ENV=process.env.NODE_ENV",
     "build": "npx rimraf -I dist; npm run build:cjs; npm run build:esm",
     "prepublish": "npm run build; npm run copy:package:cjs"
   },
-  "gitHead": "429b36616aa04c8587a26ce3c129815115e35897",
+  "gitHead": "9fc1b79b41cdc725ca6b24aec64920a599634681",
   "devDependencies": {
     "@babel/core": "^7.26.0"
   }

package/props.js

@@ -129,9 +129,9 @@ export const inheritParentProps = (element, parent) => {
   return propsStack
 }
 
-export async function update (props, options) {
+export function update (props, options) {
   const element = this.__element
-  await element.update({ props }, options)
+  element.update({ props }, options)
 }
 
 // TODO: check bind with promise

package/state.js

@@ -5,7 +5,7 @@ import { STATE_METHODS } from './keys.js'
 import {
   deepClone,
   deepMerge,
-  execPromise,
+  exec,
   overwriteDeep,
   overwriteShallow
 } from './object.js'
@@ -18,12 +18,12 @@ import {
   isUndefined
 } from './types.js'
 
-export const checkForStateTypes = async element => {
+export const checkForStateTypes = element => {
   const { state: orig, props, __ref: ref } = element
   const state = props?.state || orig
   if (isFunction(state)) {
     ref.__state = state
-    return await execPromise(state, element)
+    return exec(state, element)
   } else if (is(state)('string', 'number')) {
     ref.__state = state
     return { value: state }
@@ -165,9 +165,9 @@ export const createNestedObjectByKeyPath = (path, value) => {
   return obj
 }
 
-export const applyDependentState = async (element, state) => {
+export const applyDependentState = (element, state) => {
   const { __element } = state //
-  const origState = await execPromise(__element?.state, element)
+  const origState = exec(__element?.state, element)
   if (!origState) return
   const dependentState = deepClone(origState, STATE_METHODS)
   const newDepends = { [element.key]: dependentState }

package/tags.js

@@ -1,19 +1,9 @@
 'use strict'
 
 export const HTML_TAGS = {
-  root: [
-    'body',
-    'html'
-  ],
+  root: ['body', 'html'],
 
-  head: [
-    'title',
-    'base',
-    'meta',
-    'style',
-    'noscript',
-    'script'
-  ],
+  head: ['title', 'base', 'meta', 'style', 'noscript', 'script'],
 
   body: [
     'string',

package/types.js

@@ -4,7 +4,7 @@ import { isHtmlElement, isNode } from './node.js'
 
 export const isObject = arg => {
   if (arg === null) return false
-  return (typeof arg === 'object') && (arg.constructor === Object)
+  return typeof arg === 'object' && arg.constructor === Object
 }
 
 export const isString = arg => typeof arg === 'string'
@@ -24,11 +24,12 @@ export const isDate = d => d instanceof Date
 export const isObjectLike = arg => {
   if (arg === null) return false
   // if (isArray(arg)) return false
-  return (typeof arg === 'object')
+  return typeof arg === 'object'
 }
 
 export const isDefined = arg => {
-  return isObject(arg) ||
+  return (
+    isObject(arg) ||
     isObjectLike(arg) ||
     isString(arg) ||
     isNumber(arg) ||
@@ -38,6 +39,7 @@ export const isDefined = arg => {
     isBoolean(arg) ||
     isDate(arg) ||
     isNull(arg)
+  )
 }
 
 export const isUndefined = arg => {
@@ -59,13 +61,13 @@ export const TYPES = {
   defined: isDefined
 }
 
-export const is = (arg) => {
+export const is = arg => {
   return (...args) => {
     return args.map(val => TYPES[val](arg)).filter(v => v).length > 0
   }
 }
 
-export const isNot = (arg) => {
+export const isNot = arg => {
   return (...args) => {
     return args.map(val => TYPES[val](arg)).filter(v => v).length === 0
   }