@domql/element 2.5.146 → 2.5.148

package/create.js

@@ -80,7 +80,7 @@ const create = (element, parent, key, options = OPTIONS.create || {}, attachOpti
 
   addCaching(element, parent)
 
-  addMethods(element, parent)
+  addMethods(element, parent, options)
 
   createScope(element, parent)
 
@@ -232,9 +232,11 @@ const renderElement = (element, parent, options, attachOptions) => {
       if (path.includes('ComponentsGrid')) path.splice(0, path.indexOf('ComponentsGrid') + 2)
       if (path.includes('demoComponent')) path.splice(0, path.indexOf('demoComponent') + 1)
       const isDemoComponent = element.lookup(el => el.state.key)?.state?.key
-      console.warn('Error happened in:', isDemoComponent ? isDemoComponent + ' ' : '' + path.join('.'))
-      console.warn(element)
-      console.error(e)
+      element.warn('Error happened in:', isDemoComponent ? isDemoComponent + ' ' : '' + path.join('.'))
+      element.verbose()
+      element.error(e)
+      if (element.on?.error) element.on.error(e, element, element.state, element.context, options)
+      if (element.props?.onError) element.props.onError(e, element, element.state, element.context, options)
     }
   }
 
@@ -342,7 +344,7 @@ const onlyResolveExtends = (element, parent, key, options) => {
   if (!ref.__skipCreate) {
     addCaching(element, parent)
 
-    addMethods(element, parent)
+    addMethods(element, parent, options)
 
     createScope(element, parent)
 

package/dist/cjs/create.js

@@ -68,7 +68,7 @@ const create = (element, parent, key, options = import_options.default.create ||
   }
   switchDefaultOptions(element, parent, options);
   addCaching(element, parent);
-  (0, import_set.addMethods)(element, parent);
+  (0, import_set.addMethods)(element, parent, options);
   createScope(element, parent);
   (0, import_state.createState)(element, parent);
   if (element.scope === "state")
@@ -169,7 +169,7 @@ const addElementIntoParentChildren = (element, parent) => {
 };
 const visitedElements = /* @__PURE__ */ new WeakMap();
 const renderElement = (element, parent, options, attachOptions) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   if (visitedElements.has(element)) {
     if (ENV === "test" || ENV === "development")
       console.warn("Cyclic rendering detected:", element.__ref.path);
@@ -190,9 +190,13 @@ const renderElement = (element, parent, options, attachOptions) => {
       if (path.includes("demoComponent"))
         path.splice(0, path.indexOf("demoComponent") + 1);
       const isDemoComponent = (_b = (_a = element.lookup((el) => el.state.key)) == null ? void 0 : _a.state) == null ? void 0 : _b.key;
-      console.warn("Error happened in:", isDemoComponent ? isDemoComponent + " " : "" + path.join("."));
-      console.warn(element);
-      console.error(e);
+      element.warn("Error happened in:", isDemoComponent ? isDemoComponent + " " : "" + path.join("."));
+      element.verbose();
+      element.error(e);
+      if ((_c = element.on) == null ? void 0 : _c.error)
+        element.on.error(e, element, element.state, element.context, options);
+      if ((_d = element.props) == null ? void 0 : _d.onError)
+        element.props.onError(e, element, element.state, element.context, options);
     }
   }
   if (!ref.__if) {
@@ -273,7 +277,7 @@ const onlyResolveExtends = (element, parent, key, options) => {
   const { __ref: ref } = element;
   if (!ref.__skipCreate) {
     addCaching(element, parent);
-    (0, import_set.addMethods)(element, parent);
+    (0, import_set.addMethods)(element, parent, options);
     createScope(element, parent);
     (0, import_state.createState)(element, parent);
     if (element.scope === "state")

package/dist/cjs/methods/index.js

@@ -20,6 +20,7 @@ var methods_exports = {};
 __export(methods_exports, {
   METHODS: () => METHODS,
   defineSetter: () => defineSetter,
+  error: () => error,
   get: () => get,
   isMethod: () => isMethod,
   keys: () => keys,
@@ -35,13 +36,16 @@ __export(methods_exports, {
   setNodeStyles: () => setNodeStyles,
   setProps: () => setProps,
   spotByPath: () => spotByPath,
-  variables: () => variables
+  variables: () => variables,
+  verbose: () => verbose,
+  warn: () => warn
 });
 module.exports = __toCommonJS(methods_exports);
 var import_utils = require("@domql/utils");
 var import_tree = require("../tree");
 var import_mixins = require("../mixins");
-const spotByPath = function(path) {
+const ENV = "development";
+function spotByPath(path) {
   const element = this;
   const arr = [].concat(path);
   let active = import_tree.TREE[arr[0]];
@@ -56,8 +60,8 @@ const spotByPath = function(path) {
       return;
   }
   return active;
-};
-const lookup = function(param) {
+}
+function lookup(param) {
   const el = this;
   let { parent } = el;
   if ((0, import_utils.isFunction)(param)) {
@@ -78,8 +82,8 @@ const lookup = function(param) {
       return;
   }
   return parent;
-};
-const lookdown = function(param) {
+}
+function lookdown(param) {
   var _a;
   const el = this;
   const { __ref: ref } = el;
@@ -99,9 +103,8 @@ const lookdown = function(param) {
     if (lookdown2)
       return lookdown2;
   }
-  return null;
-};
-const lookdownAll = function(param, results = []) {
+}
+function lookdownAll(param, results = []) {
   var _a;
   const el = this;
   const { __ref: ref } = el;
@@ -118,9 +121,9 @@ const lookdownAll = function(param, results = []) {
     }
     (_a = childElem == null ? void 0 : childElem.lookdownAll) == null ? void 0 : _a.call(childElem, param, results);
   }
-  return results.length ? results : null;
-};
-const setNodeStyles = function(params = {}) {
+  return results.length ? results : void 0;
+}
+function setNodeStyles(params = {}) {
   var _a;
   const el = this;
   if (!((_a = el.node) == null ? void 0 : _a.style))
@@ -134,8 +137,8 @@ const setNodeStyles = function(params = {}) {
       el.node.style[param] = value;
   }
   return el;
-};
-const remove = function() {
+}
+function remove() {
   const element = this;
   if ((0, import_utils.isFunction)(element.node.remove))
     element.node.remove();
@@ -146,20 +149,20 @@ const remove = function() {
   delete element.parent[element.key];
   if (element.parent.__ref)
     element.parent.__ref.__children = (0, import_utils.removeValueFromArray)(element.parent.__ref.__children, element.key);
-};
-const get = function(param) {
+}
+function get(param) {
   const element = this;
   return element[param];
-};
-const setProps = function(param, options) {
+}
+function setProps(param, options) {
   const element = this;
   if (!param || !element.props)
     return;
   element.update({ props: param }, options);
   return element;
-};
+}
 const defineSetter = (element, key, get2, set) => Object.defineProperty(element, key, { get: get2, set });
-const keys = function() {
+function keys() {
   const element = this;
   const keys2 = [];
   for (const param in element) {
@@ -169,8 +172,8 @@ const keys = function() {
     keys2.push(param);
   }
   return keys2;
-};
-const parse = function(excl = []) {
+}
+function parse(excl = []) {
   const element = this;
   const obj = {};
   const keyList = keys.call(element);
@@ -195,8 +198,8 @@ const parse = function(excl = []) {
       obj[v] = val;
   });
   return obj;
-};
-const parseDeep = function(excl = []) {
+}
+function parseDeep(excl = []) {
   const element = this;
   const obj = parse.call(element, excl);
   for (const v in obj) {
@@ -207,32 +210,47 @@ const parseDeep = function(excl = []) {
     }
   }
   return obj;
-};
-const log = function(...args) {
+}
+function verbose(...args) {
   const element = this;
-  const { __ref } = element;
+  const { __ref: ref } = element;
   console.group(element.key);
   if (args.length) {
     args.forEach((v) => console.log(`%c${v}:
 `, "font-weight: bold", element[v]));
   } else {
-    console.log(__ref.path);
+    console.log(ref.path);
     const keys2 = element.keys();
     keys2.forEach((v) => console.log(`%c${v}:
 `, "font-weight: bold", element[v]));
   }
   console.groupEnd(element.key);
   return element;
-};
-const nextElement = function() {
+}
+function log(...params) {
+  if (ENV === "test" || ENV === "development") {
+    console.log(...params);
+  }
+}
+function warn(...params) {
+  if (ENV === "test" || ENV === "development") {
+    console.warn(...params);
+  }
+}
+function error(...params) {
+  if (ENV === "test" || ENV === "development") {
+    console.error(...params);
+  }
+}
+function nextElement() {
   const element = this;
   const { key, parent } = element;
   const { __children } = parent.__ref;
   const currentIndex = __children.indexOf(key);
   const nextChild = __children[currentIndex + 1];
   return parent[nextChild];
-};
-const previousElement = function(el) {
+}
+function previousElement(el) {
   const element = el || this;
   const { key, parent } = element;
   const { __children } = parent.__ref;
@@ -240,8 +258,8 @@ const previousElement = function(el) {
     return;
   const currentIndex = __children.indexOf(key);
   return parent[__children[currentIndex - 1]];
-};
-const variables = function(obj = {}) {
+}
+function variables(obj = {}) {
   const element = this;
   if (!element.data)
     element.data = {};
@@ -275,7 +293,7 @@ const variables = function(obj = {}) {
       }, timeout);
     }
   };
-};
+}
 const METHODS = [
   "set",
   "reset",
@@ -295,10 +313,13 @@ const METHODS = [
   "variables",
   "if",
   "log",
+  "verbose",
+  "warn",
+  "error",
   "nextElement",
   "previousElement"
 ];
-const isMethod = function(param, element) {
+function isMethod(param, element) {
   var _a, _b;
   return METHODS.includes(param) || ((_b = (_a = element == null ? void 0 : element.context) == null ? void 0 : _a.methods) == null ? void 0 : _b[param]);
-};
+}

package/dist/cjs/methods/set.js

@@ -36,7 +36,7 @@ var import_set = __toESM(require("../set"), 1);
 var import_update = __toESM(require("../update"), 1);
 var import__ = require("./");
 var import_content = require("../mixins/content");
-const addMethods = (element, parent, options) => {
+const addMethods = (element, parent, options = {}) => {
   const proto = {
     set: import_set.default,
     reset: import_set.reset,
@@ -58,8 +58,12 @@ const addMethods = (element, parent, options) => {
     previousElement: import__.previousElement
   };
   if (element.context.methods)
-    (0, import_utils.merge)(proto, element.context.methods);
-  if ((0, import_utils.isDevelopment)())
+    (options.strict ? import_utils.merge : import_utils.overwrite)(proto, element.context.methods);
+  if ((0, import_utils.isDevelopment)()) {
     proto.log = import__.log;
+    proto.verbose = import__.verbose;
+    proto.warn = import__.warn;
+    proto.error = import__.error;
+  }
   Object.setPrototypeOf(element, proto);
 };

package/dist/cjs/update.js

@@ -93,7 +93,7 @@ const update = function(params = {}, opts) {
     if (beforeUpdateReturns === false)
       return element;
   }
-  (0, import_utils.overwriteDeep)(element, params, import_utils2.METHODS_EXL);
+  (0, import_utils.overwriteDeep)(element, params, { exclude: import_utils2.METHODS_EXL });
   (0, import_iterate.throughExecProps)(element);
   (0, import_iterate.throughUpdatedExec)(element, { ignore: UPDATE_DEFAULT_OPTIONS });
   (0, import_iterate.throughUpdatedDefine)(element);

package/dist/cjs/utils/onlyResolveExtends.js

@@ -55,7 +55,7 @@ const onlyResolveExtends = (element, parent, key, options) => {
     if (!ref2.__children)
       ref2.__children = [];
   }
-  (0, import_set.addMethods)(element, parent);
+  (0, import_set.addMethods)(element, parent, options);
   (0, import_state.createState)(element, parent);
   const ref = __ref;
   if ((0, import_utils.isFunction)(element.if)) {

package/methods/index.js

@@ -3,9 +3,10 @@
 import { isDefined, isObject, isFunction, isObjectLike, isProduction, removeValueFromArray, deepClone } from '@domql/utils'
 import { TREE } from '../tree'
 import { parseFilters, registry } from '../mixins'
+const ENV = process.env.NODE_ENV
 
 // TODO: update these files
-export const spotByPath = function (path) {
+export function spotByPath (path) {
   const element = this
   const arr = [].concat(path)
   let active = TREE[arr[0]]
@@ -23,7 +24,7 @@ export const spotByPath = function (path) {
 }
 
 // TODO: update these files
-export const lookup = function (param) {
+export function lookup (param) {
   const el = this
   let { parent } = el
 
@@ -44,7 +45,7 @@ export const lookup = function (param) {
   return parent
 }
 
-export const lookdown = function (param) {
+export function lookdown (param) {
   const el = this
   const { __ref: ref } = el
   const children = ref.__children
@@ -63,11 +64,9 @@ export const lookdown = function (param) {
     const lookdown = childElem?.lookdown?.(param)
     if (lookdown) return lookdown
   }
-
-  return null
 }
 
-export const lookdownAll = function (param, results = []) {
+export function lookdownAll (param, results = []) {
   const el = this
   const { __ref: ref } = el
   const children = ref.__children
@@ -84,10 +83,10 @@ export const lookdownAll = function (param, results = []) {
     childElem?.lookdownAll?.(param, results)
   }
 
-  return results.length ? results : null
+  return results.length ? results : undefined
 }
 
-export const setNodeStyles = function (params = {}) {
+export function setNodeStyles (params = {}) {
   const el = this
   if (!el.node?.style) return
 
@@ -101,7 +100,7 @@ export const setNodeStyles = function (params = {}) {
   return el
 }
 
-export const remove = function () {
+export function remove () {
   const element = this
   if (isFunction(element.node.remove)) element.node.remove()
   else if (!isProduction()) {
@@ -112,28 +111,28 @@ export const remove = function () {
   if (element.parent.__ref) element.parent.__ref.__children = removeValueFromArray(element.parent.__ref.__children, element.key)
 }
 
-export const get = function (param) {
+export function get (param) {
   const element = this
   return element[param]
 }
 
-export const setProps = function (param, options) {
+export function setProps (param, options) {
   const element = this
   if (!param || !element.props) return
   element.update({ props: param }, options)
   return element
 }
 
-// export const set = function () {
+// export function set () {
 // }
 
-// export const update = function () {
+// export function update () {
 // }
 
 export const defineSetter = (element, key, get, set) =>
   Object.defineProperty(element, key, { get, set })
 
-export const keys = function () {
+export function keys () {
   const element = this
   const keys = []
   for (const param in element) {
@@ -143,7 +142,7 @@ export const keys = function () {
   return keys
 }
 
-export const parse = function (excl = []) {
+export function parse (excl = []) {
   const element = this
   const obj = {}
   const keyList = keys.call(element)
@@ -165,7 +164,7 @@ export const parse = function (excl = []) {
   return obj
 }
 
-export const parseDeep = function (excl = []) {
+export function parseDeep (excl = []) {
   const element = this
   const obj = parse.call(element, excl)
   for (const v in obj) {
@@ -175,14 +174,14 @@ export const parseDeep = function (excl = []) {
   return obj
 }
 
-export const log = function (...args) {
+export function verbose (...args) {
   const element = this
-  const { __ref } = element
+  const { __ref: ref } = element
   console.group(element.key)
   if (args.length) {
     args.forEach(v => console.log(`%c${v}:\n`, 'font-weight: bold', element[v]))
   } else {
-    console.log(__ref.path)
+    console.log(ref.path)
     const keys = element.keys()
     keys.forEach(v => console.log(`%c${v}:\n`, 'font-weight: bold', element[v]))
   }
@@ -190,7 +189,25 @@ export const log = function (...args) {
   return element
 }
 
-export const nextElement = function () {
+export function log (...params) {
+  if (ENV === 'test' || ENV === 'development') {
+    console.log(...params)
+  }
+}
+
+export function warn (...params) {
+  if (ENV === 'test' || ENV === 'development') {
+    console.warn(...params)
+  }
+}
+
+export function error (...params) {
+  if (ENV === 'test' || ENV === 'development') {
+    console.error(...params)
+  }
+}
+
+export function nextElement () {
   const element = this
   const { key, parent } = element
   const { __children } = parent.__ref
@@ -201,7 +218,7 @@ export const nextElement = function () {
   return parent[nextChild]
 }
 
-export const previousElement = function (el) {
+export function previousElement (el) {
   const element = el || this
   const { key, parent } = element
   const { __children } = parent.__ref
@@ -212,7 +229,7 @@ export const previousElement = function (el) {
   return parent[__children[currentIndex - 1]]
 }
 
-export const variables = function (obj = {}) {
+export function variables (obj = {}) {
   const element = this
   if (!element.data) element.data = {}
   if (!element.data.varCaches) element.data.varCaches = {}
@@ -263,10 +280,13 @@ export const METHODS = [
   'variables',
   'if',
   'log',
+  'verbose',
+  'warn',
+  'error',
   'nextElement',
   'previousElement'
 ]
 
-export const isMethod = function (param, element) {
+export function isMethod (param, element) {
   return METHODS.includes(param) || element?.context?.methods?.[param]
 }

package/methods/set.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isDevelopment, merge } from '@domql/utils'
+import { isDevelopment, merge, overwrite } from '@domql/utils'
 
 import set, { reset } from '../set'
 import update from '../update'
@@ -14,6 +14,9 @@ import {
   remove,
   spotByPath,
   log,
+  verbose,
+  warn,
+  error,
   variables,
   keys,
   parse,
@@ -24,7 +27,7 @@ import {
 
 import { removeContent, updateContent } from '../mixins/content'
 
-export const addMethods = (element, parent, options) => {
+export const addMethods = (element, parent, options = {}) => {
   const proto = {
     set,
     reset,
@@ -45,7 +48,12 @@ export const addMethods = (element, parent, options) => {
     nextElement,
     previousElement
   }
-  if (element.context.methods) merge(proto, element.context.methods)
-  if (isDevelopment()) proto.log = log
+  if (element.context.methods) (options.strict ? merge : overwrite)(proto, element.context.methods)
+  if (isDevelopment()) {
+    proto.log = log
+    proto.verbose = verbose
+    proto.warn = warn
+    proto.error = error
+  }
   Object.setPrototypeOf(element, proto)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.146",
+  "version": "2.5.148",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -26,12 +26,12 @@
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
   "dependencies": {
-    "@domql/event": "^2.5.144",
-    "@domql/render": "^2.5.144",
-    "@domql/state": "^2.5.144",
-    "@domql/utils": "^2.5.144"
+    "@domql/event": "^2.5.148",
+    "@domql/render": "^2.5.148",
+    "@domql/state": "^2.5.148",
+    "@domql/utils": "^2.5.148"
   },
-  "gitHead": "aa98091d5476746a259342ce38e5c7b507d12417",
+  "gitHead": "6706914c73f3c9669ff443c0c890dea1f4e908ab",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/update.js

@@ -80,7 +80,7 @@ const update = function (params = {}, opts) {
     if (beforeUpdateReturns === false) return element
   }
 
-  overwriteDeep(element, params, METHODS_EXL)
+  overwriteDeep(element, params, { exclude: METHODS_EXL })
   throughExecProps(element)
   throughUpdatedExec(element, { ignore: UPDATE_DEFAULT_OPTIONS })
   throughUpdatedDefine(element)
@@ -312,7 +312,7 @@ const createStateUpdate = (element, parent, options) => {
 export default update
 
 // save updates history
-// const overwriteChanges = overwriteDeep(element, params, METHODS_EXL)
+// const overwriteChanges = overwriteDeep(element, params, { exclude: METHODS_EXL })
 // // const overwriteChanges = overwriteDeep(element, params)
 // const propsChanges = throughExecProps(element)
 // const execChanges = throughUpdatedExec(element, { ignore: UPDATE_DEFAULT_OPTIONS })

package/utils/onlyResolveExtends.js

@@ -52,7 +52,7 @@ export const onlyResolveExtends = (element, parent, key, options) => {
     // if (!ref.root) ref.root = hasRoot ? element : parentRef.root
   }
 
-  addMethods(element, parent)
+  addMethods(element, parent, options)
 
   createState(element, parent)