@domql/element 2.5.160 → 2.5.162

package/create.js

@@ -14,7 +14,7 @@ import {
   isUndefined,
   generateKey,
   checkIfKeyIsComponent,
-  deepCloneWithExtend,
+  deepClone,
   applyComponentFromContext,
   applyKeyComponentAsExtend,
   isVariant,
@@ -60,7 +60,7 @@ export const create = (element, parent, key, options = OPTIONS.create || {}, att
 
   const ref = addRef(element, parent, key)
 
-  ref.__initialProps = deepCloneWithExtend(element.props, [])
+  ref.__initialProps = deepClone(element.props)
 
   applyContext(element, parent, options)
 

package/dist/cjs/create.js

@@ -57,7 +57,7 @@ const create = (element, parent, key, options = import_options.OPTIONS.create ||
   parent = redefineParent(element, parent, key);
   key = createKey(element, parent, key);
   const ref = addRef(element, parent, key);
-  ref.__initialProps = (0, import_utils.deepCloneWithExtend)(element.props, []);
+  ref.__initialProps = (0, import_utils.deepClone)(element.props);
   applyContext(element, parent, options);
   (0, import_utils.applyComponentFromContext)(element, parent, options);
   if (!ref.__skipCreate) {

package/dist/cjs/methods/index.js

@@ -253,7 +253,7 @@ function error(...params) {
       debugger;
     console.error(...params);
     if ((_b = params[params.length - 1]) == null ? void 0 : _b.verbose)
-      this.verbose();
+      verbose.call(this);
   }
 }
 function nextElement() {

package/dist/cjs/mixins/attr.js

@@ -25,14 +25,14 @@ module.exports = __toCommonJS(attr_exports);
 var import_utils = require("@domql/utils");
 var import_report = require("@domql/report");
 var import_utils2 = require("../utils");
-const attr = (params, element, node) => {
-  const { __ref } = element;
-  const { __attr } = __ref;
+function attr(params, element, node) {
+  const { __ref: ref, props } = element;
+  const { __attr } = ref;
   if ((0, import_utils.isNot)("object"))
     (0, import_report.report)("HTMLInvalidAttr", params);
   if (params) {
-    if (element.props.attr)
-      (0, import_utils2.deepMerge)(params, element.props.attr);
+    if (props.attr)
+      (0, import_utils2.deepMerge)(params, props.attr);
     for (const attr2 in params) {
       const val = (0, import_utils.exec)(params[attr2], element);
       if (val !== false && !(0, import_utils.isUndefined)(val) && !(0, import_utils.isNull)(val) && node.setAttribute)
@@ -42,5 +42,5 @@ const attr = (params, element, node) => {
       __attr[attr2] = val;
     }
   }
-};
+}
 var attr_default = attr;

package/dist/cjs/mixins/classList.js

@@ -69,7 +69,7 @@ const applyClassListOnNode = (params, element, node) => {
   node.classList = className;
   return className;
 };
-const applyClasslist = (params, element, node) => {
+function applyClasslist(params, element, node) {
   applyClassListOnNode(params, element, node);
-};
+}
 var classList_default = applyClasslist;

package/dist/cjs/mixins/content.js

@@ -61,7 +61,7 @@ const removeContent = function(el, opts = {}) {
     delete element[contentElementKey];
   }
 };
-const setContent = (param, element, node, opts) => {
+function setContent(param, element, node, opts) {
   const contentElementKey = (0, import_utils.setContentKey)(element, opts);
   if (param && element) {
     if (element[contentElementKey].update) {
@@ -70,5 +70,5 @@ const setContent = (param, element, node, opts) => {
       import_set.set.call(element, param, opts);
     }
   }
-};
+}
 var content_default = setContent;

package/dist/cjs/mixins/data.js

@@ -24,7 +24,7 @@ __export(data_exports, {
 module.exports = __toCommonJS(data_exports);
 var import_utils = require("@domql/utils");
 var import_report = require("@domql/report");
-const data = (params, element, node) => {
+function data(params, element, node) {
   if (params) {
     if (element.props.data)
       (0, import_utils.deepMerge)(params, element.props.data);
@@ -38,5 +38,5 @@ const data = (params, element, node) => {
       }
     }
   }
-};
+}
 var data_default = data;

package/dist/cjs/mixins/html.js

@@ -23,7 +23,7 @@ __export(html_exports, {
 });
 module.exports = __toCommonJS(html_exports);
 var import_utils = require("@domql/utils");
-const html = (param, element, node) => {
+function html(param, element, node) {
   var _a;
   const prop = (0, import_utils.exec)(param, element) || (0, import_utils.exec)((_a = element == null ? void 0 : element.props) == null ? void 0 : _a.html, element);
   const { __ref } = element;
@@ -34,5 +34,5 @@ const html = (param, element, node) => {
       node.innerHTML = prop;
     __ref.__html = prop;
   }
-};
+}
 var html_default = html;

package/dist/cjs/mixins/scope.js

@@ -23,7 +23,7 @@ __export(scope_exports, {
 });
 module.exports = __toCommonJS(scope_exports);
 var import_utils = require("@domql/utils");
-const scope = (params, element, node) => {
+function scope(params, element, node) {
   if (!(0, import_utils.isObject)(params))
     return;
   for (const scopeItem in params) {
@@ -34,5 +34,5 @@ const scope = (params, element, node) => {
       element.scope[scopeItem] = value;
     }
   }
-};
+}
 var scope_default = scope;

package/dist/cjs/mixins/state.js

@@ -24,7 +24,7 @@ __export(state_exports, {
 module.exports = __toCommonJS(state_exports);
 var import_state = require("@domql/state");
 var import_utils = require("@domql/utils");
-const state = (params, element, node) => {
+function state(params, element, node) {
   const state2 = (0, import_utils.exec)(params, element);
   if ((0, import_utils.isObject)(state2)) {
     for (const param in state2) {
@@ -35,5 +35,5 @@ const state = (params, element, node) => {
     }
   }
   return element;
-};
+}
 var state_default = state;

package/dist/cjs/mixins/style.js

@@ -24,12 +24,12 @@ __export(style_exports, {
 module.exports = __toCommonJS(style_exports);
 var import_utils = require("@domql/utils");
 var import_report = require("@domql/report");
-const style = (params, element, node) => {
+function style(params, element, node) {
   if (params) {
     if ((0, import_utils.isObject)(params))
       (0, import_utils.map)(node.style, params, element);
     else
       (0, import_report.report)("HTMLInvalidStyles", params);
   }
-};
+}
 var style_default = style;

package/dist/cjs/mixins/text.js

@@ -24,7 +24,7 @@ __export(text_exports, {
 module.exports = __toCommonJS(text_exports);
 var import_create = require("../create");
 var import_utils = require("@domql/utils");
-const text = (param, element, node) => {
+function text(param, element, node) {
   let prop = (0, import_utils.exec)(param, element);
   if ((0, import_utils.isString)(prop) && prop.includes("{{")) {
     prop = (0, import_utils.replaceLiteralsWithObjectFields)(prop, element.state);
@@ -41,5 +41,5 @@ const text = (param, element, node) => {
     } else
       (0, import_create.create)({ tag: "string", text: prop }, element, "__text");
   }
-};
+}
 var text_default = text;

package/dist/cjs/props/create.js

@@ -57,7 +57,7 @@ const syncProps = (props, element, opts) => {
     }
     element.props = (0, import_utils.deepMerge)(
       mergedProps,
-      (0, import_utils.deepCloneWithExtend)(execProps, import_ignore.IGNORE_PROPS_PARAMS),
+      (0, import_utils.deepClone)(execProps, { ignore: import_ignore.IGNORE_PROPS_PARAMS }),
       import_ignore.IGNORE_PROPS_PARAMS
     );
   });

package/dist/cjs/update.js

@@ -46,7 +46,7 @@ const UPDATE_DEFAULT_OPTIONS = {
 };
 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"]);
+  const options = (0, import_utils.deepClone)((0, import_utils.isObject)(opts) ? (0, import_utils2.deepMerge)(opts, UPDATE_DEFAULT_OPTIONS) : UPDATE_DEFAULT_OPTIONS, { exclude: ["calleeElement"] });
   options.calleeElement = calleeElementCache;
   const element = this;
   const { parent, node, key } = element;

package/dist/cjs/utils/extendUtils.js

@@ -103,7 +103,7 @@ const deepMergeExtend = (element, extend) => {
 };
 const cloneAndMergeArrayExtend = (stack) => {
   return stack.reduce((a, c) => {
-    return deepMergeExtend(a, (0, import_utils.deepCloneWithExtend)(c));
+    return deepMergeExtend(a, (0, import_utils.deepClone)(c));
   }, {});
 };
 const fallbackStringExtend = (extend, context, options = {}) => {

package/dist/cjs/utils/object.js

@@ -21,7 +21,6 @@ __export(object_exports, {
   METHODS: () => METHODS,
   METHODS_EXL: () => METHODS_EXL,
   clone: () => clone,
-  deepClone: () => deepClone,
   deepMerge: () => deepMerge,
   flattenRecursive: () => flattenRecursive,
   mergeAndCloneIfArray: () => mergeAndCloneIfArray,
@@ -113,31 +112,6 @@ const clone = (obj, exclude = METHODS_EXL) => {
   }
   return o;
 };
-const deepClone = (obj, exclude = METHODS_EXL, seen = /* @__PURE__ */ new WeakMap()) => {
-  if (obj === null || typeof obj !== "object") {
-    return obj;
-  }
-  if (obj instanceof window.Node || obj === window || obj instanceof window.Document) {
-    return obj;
-  }
-  if (seen.has(obj)) {
-    return seen.get(obj);
-  }
-  const o = Array.isArray(obj) ? [] : {};
-  seen.set(obj, o);
-  for (const key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      if (exclude.includes(key))
-        continue;
-      let value = obj[key];
-      if (key === "extend" && Array.isArray(value)) {
-        value = mergeArray(value, exclude);
-      }
-      o[key] = deepClone(value, exclude, seen);
-    }
-  }
-  return o;
-};
 const overwrite = (element, params, options) => {
   const changes = {};
   const { __ref } = element;
@@ -184,10 +158,10 @@ const mergeIfExisted = (a, b) => {
   return a || b;
 };
 const mergeArray = (arr, exclude = ["parent", "node", "__element", "state", "context", "__ref"]) => {
-  return arr.reduce((a, c) => deepMerge(a, (0, import_utils.deepCloneWithExtend)(c, exclude)), {});
+  return arr.reduce((a, c) => deepMerge(a, (0, import_utils.deepClone)(c, { exclude })), {});
 };
 const mergeAndCloneIfArray = (obj) => {
-  return (0, import_utils.isArray)(obj) ? mergeArray(obj) : (0, import_utils.deepCloneWithExtend)(obj);
+  return (0, import_utils.isArray)(obj) ? mergeArray(obj) : (0, import_utils.deepClone)(obj);
 };
 const flattenRecursive = (param, prop, stack = []) => {
   const objectized = mergeAndCloneIfArray(param);

package/methods/index.js

@@ -2,7 +2,7 @@
 
 import { isDefined, isObject, isFunction, isObjectLike, isProduction, removeValueFromArray, deepClone } from '@domql/utils'
 import { TREE } from '../tree'
-import { parseFilters, REGISTRY, registry } from '../mixins'
+import { parseFilters, REGISTRY } from '../mixins'
 const ENV = process.env.NODE_ENV
 
 // TODO: update these files
@@ -216,7 +216,7 @@ export function error (...params) {
   if (ENV === 'test' || ENV === 'development') {
     if (params[params.length - 1]?.debugger) debugger // eslint-disable-line
     console.error(...params)
-    if (params[params.length - 1]?.verbose) this.verbose()
+    if (params[params.length - 1]?.verbose) verbose.call(this)
   }
 }
 

package/mixins/attr.js

@@ -7,12 +7,12 @@ import { deepMerge } from '../utils'
 /**
  * Recursively add attributes to a DOM node
  */
-export const attr = (params, element, node) => {
-  const { __ref } = element
-  const { __attr } = __ref
+export function attr (params, element, node) {
+  const { __ref: ref, props } = element
+  const { __attr } = ref
   if (isNot('object')) report('HTMLInvalidAttr', params)
   if (params) {
-    if (element.props.attr) deepMerge(params, element.props.attr)
+    if (props.attr) deepMerge(params, props.attr)
     for (const attr in params) {
       const val = exec(params[attr], element)
       // if (__attr[attr] === val) return

package/mixins/classList.js

@@ -43,7 +43,7 @@ export const applyClassListOnNode = (params, element, node) => {
   return className
 }
 
-export const applyClasslist = (params, element, node) => {
+export function applyClasslist (params, element, node) {
   applyClassListOnNode(params, element, node)
 }
 

package/mixins/content.js

@@ -41,7 +41,7 @@ export const removeContent = function (el, opts = {}) {
  * Appends anything as content
  * an original one as a child
  */
-export const setContent = (param, element, node, opts) => {
+export function setContent (param, element, node, opts) {
   const contentElementKey = setContentKey(element, opts)
   if (param && element) {
     if (element[contentElementKey].update) {

package/mixins/data.js

@@ -7,7 +7,7 @@ import { report } from '@domql/report'
  * Apply data parameters on the DOM nodes
  * this should only work if `showOnNode: true` is passed
  */
-export const data = (params, element, node) => {
+export function data (params, element, node) {
   if (params) {
     if (element.props.data) deepMerge(params, element.props.data)
     if (params.showOnNode) {

package/mixins/html.js

@@ -6,7 +6,7 @@ import { exec } from '@domql/utils'
  * Appends raw HTML as content
  * an original one as a child
  */
-export const html = (param, element, node) => {
+export function html (param, element, node) {
   const prop = exec(param, element) || exec(element?.props?.html, element)
   const { __ref } = element
   if (prop !== __ref.__html) {

package/mixins/scope.js

@@ -6,7 +6,7 @@ import { isFunction, isObject } from '@domql/utils'
  * Apply data parameters on the DOM nodes
  * this should only work if `showOnNode: true` is passed
  */
-export const scope = (params, element, node) => {
+export function scope (params, element, node) {
   if (!isObject(params)) return
 
   // Apply data params on node

package/mixins/state.js

@@ -3,7 +3,7 @@
 import { IGNORE_STATE_PARAMS } from '@domql/state'
 import { exec, isObject } from '@domql/utils'
 
-export const state = (params, element, node) => {
+export function state (params, element, node) {
   const state = exec(params, element)
 
   if (isObject(state)) {

package/mixins/style.js

@@ -6,7 +6,7 @@ import { report } from '@domql/report'
 /**
  * Recursively add styles to a DOM node
  */
-export const style = (params, element, node) => {
+export function style (params, element, node) {
   if (params) {
     if (isObject(params)) map(node.style, params, element)
     else report('HTMLInvalidStyles', params)

package/mixins/text.js

@@ -11,7 +11,7 @@ import {
  * Creates a text node and appends into
  * an original one as a child
  */
-export const text = (param, element, node) => {
+export function text (param, element, node) {
   let prop = exec(param, element)
   if (isString(prop) && prop.includes('{{')) {
     prop = replaceLiteralsWithObjectFields(prop, element.state)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.160",
+  "version": "2.5.162",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -22,16 +22,16 @@
     "copy:package:cjs": "cp ../../build/package-cjs.json dist/cjs/package.json",
     "build:esm": "npx esbuild *.js **/*.js --target=es2019 --format=esm --outdir=dist/esm",
     "build:cjs": "npx esbuild *.js **/*.js --target=node16 --format=cjs --outdir=dist/cjs",
-    "build": "yarn build:cjs",
-    "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
+    "build": "npm run build:cjs",
+    "prepublish": "rimraf -I dist && npm run build && npm run copy:package:cjs"
   },
   "dependencies": {
-    "@domql/event": "^2.5.159",
-    "@domql/render": "^2.5.159",
-    "@domql/state": "^2.5.159",
-    "@domql/utils": "^2.5.159"
+    "@domql/event": "^2.5.162",
+    "@domql/render": "^2.5.162",
+    "@domql/state": "^2.5.162",
+    "@domql/utils": "^2.5.162"
   },
-  "gitHead": "ab896b123edd1ec6d30fd01d28bd1a0ef4db735c",
+  "gitHead": "0aeb25f284d863a57821a0a74937c2b9babb7969",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/props/create.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { exec, isArray, isObject, deepCloneWithExtend, deepMerge } from '@domql/utils'
+import { exec, isArray, isObject, deepClone, deepMerge } from '@domql/utils'
 import { IGNORE_PROPS_PARAMS } from './ignore'
 
 import { inheritParentProps } from './inherit'
@@ -39,7 +39,7 @@ export const syncProps = (props, element, opts) => {
     // it was causing infinite loop at early days
     element.props = deepMerge(
       mergedProps,
-      deepCloneWithExtend(execProps, IGNORE_PROPS_PARAMS),
+      deepClone(execProps, { ignore: IGNORE_PROPS_PARAMS }),
       IGNORE_PROPS_PARAMS
     )
   })

package/update.js

@@ -12,7 +12,8 @@ import {
   merge,
   isVariant,
   overwriteDeep,
-  createSnapshotId
+  createSnapshotId,
+  deepClone
 } from '@domql/utils'
 
 import { applyEvent, triggerEventOn, triggerEventOnUpdate } from '@domql/event'
@@ -25,7 +26,7 @@ import { throughExecProps, throughUpdatedDefine, throughUpdatedExec } from './it
 import { REGISTRY } from './mixins'
 import { applyParam } from './utils/applyParam'
 import { OPTIONS } from './cache/options'
-import { METHODS_EXL, deepClone, deepMerge } from './utils' // old utils (current)
+import { METHODS_EXL, deepMerge } from './utils' // old utils (current)
 
 const snapshot = {
   snapshotId: createSnapshotId
@@ -42,7 +43,7 @@ const UPDATE_DEFAULT_OPTIONS = {
 
 export const update = function (params = {}, opts) {
   const calleeElementCache = opts?.calleeElement
-  const options = deepClone(isObject(opts) ? deepMerge(opts, UPDATE_DEFAULT_OPTIONS) : UPDATE_DEFAULT_OPTIONS, ['calleeElement'])
+  const options = deepClone(isObject(opts) ? deepMerge(opts, UPDATE_DEFAULT_OPTIONS) : UPDATE_DEFAULT_OPTIONS, { exclude: ['calleeElement'] })
   options.calleeElement = calleeElementCache
   const element = this
   const { parent, node, key } = element

package/utils/extendUtils.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isArray, isFunction, isObject, isString, deepCloneWithExtend } from '@domql/utils'
+import { isArray, isFunction, isObject, isString, deepClone } from '@domql/utils'
 const ENV = process.env.NODE_ENV
 
 export const generateHash = () => Math.random().toString(36).substring(2)
@@ -71,7 +71,7 @@ export const deepMergeExtend = (element, extend) => {
 
 export const cloneAndMergeArrayExtend = stack => {
   return stack.reduce((a, c) => {
-    return deepMergeExtend(a, deepCloneWithExtend(c))
+    return deepMergeExtend(a, deepClone(c))
   }, {})
 }
 

package/utils/object.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isArray, isObject, isObjectLike, joinArrays, deepCloneWithExtend } from '@domql/utils'
+import { isArray, isObject, isObjectLike, joinArrays, deepClone } from '@domql/utils'
 import { IGNORE_PROPS_PARAMS } from '../props'
 
 // breaks server build
@@ -68,48 +68,6 @@ export const clone = (obj, exclude = METHODS_EXL) => {
   return o
 }
 
-/**
- * Deep cloning of object
- */
-export const deepClone = (obj, exclude = METHODS_EXL, seen = new WeakMap()) => {
-  // Check for null or undefined
-  if (obj === null || typeof obj !== 'object') {
-    return obj
-  }
-
-  // Check for DOM nodes, Window, or Document
-  if (obj instanceof window.Node || obj === window || obj instanceof window.Document) {
-    return obj
-  }
-
-  // Check for circular references
-  if (seen.has(obj)) {
-    return seen.get(obj)
-  }
-
-  // Create a new object or array
-  const o = Array.isArray(obj) ? [] : {}
-
-  // Store this object in our circular reference map
-  seen.set(obj, o)
-
-  for (const key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      if (exclude.includes(key)) continue
-
-      let value = obj[key]
-
-      if (key === 'extend' && Array.isArray(value)) {
-        value = mergeArray(value, exclude)
-      }
-
-      o[key] = deepClone(value, exclude, seen)
-    }
-  }
-
-  return o
-}
-
 // export const deepClone = (obj, exclude = METHODS_EXL) => {
 //   const o = isArray(obj) ? [] : {}
 //   for (const e in obj) {
@@ -187,14 +145,14 @@ export const mergeIfExisted = (a, b) => {
  * Merges array extends
  */
 export const mergeArray = (arr, exclude = ['parent', 'node', '__element', 'state', 'context', '__ref']) => {
-  return arr.reduce((a, c) => deepMerge(a, deepCloneWithExtend(c, exclude)), {})
+  return arr.reduce((a, c) => deepMerge(a, deepClone(c, { exclude })), {})
 }
 
 /**
  * Merges array extends
  */
 export const mergeAndCloneIfArray = obj => {
-  return isArray(obj) ? mergeArray(obj) : deepCloneWithExtend(obj)
+  return isArray(obj) ? mergeArray(obj) : deepClone(obj)
 }
 
 /**