@domql/element 2.5.148 → 2.5.150

package/create.js

@@ -90,7 +90,7 @@ const create = (element, parent, key, options = OPTIONS.create || {}, attachOpti
   createIfConditionFlag(element, parent)
 
   // apply props settings
-  createProps(element, parent)
+  createProps(element, parent, options)
   if (element.scope === 'props' || element.scope === true) element.scope = element.props
 
   // recatch if it passess props again
@@ -234,7 +234,7 @@ const renderElement = (element, parent, options, attachOptions) => {
       const isDemoComponent = element.lookup(el => el.state.key)?.state?.key
       element.warn('Error happened in:', isDemoComponent ? isDemoComponent + ' ' : '' + path.join('.'))
       element.verbose()
-      element.error(e)
+      element.error(e, options)
       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)
     }
@@ -354,7 +354,7 @@ const onlyResolveExtends = (element, parent, key, options) => {
     createIfConditionFlag(element, parent)
 
     // apply props settings
-    createProps(element, parent)
+    createProps(element, parent, options)
     if (element.scope === 'props' || element.scope === true) element.scope = element.props
 
     if (element.node && ref.__if) { parent[key || element.key] = element } // Borrowed from assignNode()

package/dist/cjs/create.js

@@ -74,7 +74,7 @@ const create = (element, parent, key, options = import_options.default.create ||
   if (element.scope === "state")
     element.scope = element.state;
   createIfConditionFlag(element, parent);
-  (0, import_props.createProps)(element, parent);
+  (0, import_props.createProps)(element, parent, options);
   if (element.scope === "props" || element.scope === true)
     element.scope = element.props;
   createIfConditionFlag(element, parent);
@@ -192,7 +192,7 @@ const renderElement = (element, parent, options, attachOptions) => {
       const isDemoComponent = (_b = (_a = element.lookup((el) => el.state.key)) == null ? void 0 : _a.state) == null ? void 0 : _b.key;
       element.warn("Error happened in:", isDemoComponent ? isDemoComponent + " " : "" + path.join("."));
       element.verbose();
-      element.error(e);
+      element.error(e, options);
       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)
@@ -283,7 +283,7 @@ const onlyResolveExtends = (element, parent, key, options) => {
     if (element.scope === "state")
       element.scope = element.state;
     createIfConditionFlag(element, parent);
-    (0, import_props.createProps)(element, parent);
+    (0, import_props.createProps)(element, parent, options);
     if (element.scope === "props" || element.scope === true)
       element.scope = element.props;
     if (element.node && ref.__if) {

package/dist/cjs/methods/index.js

@@ -166,7 +166,7 @@ function keys() {
   const element = this;
   const keys2 = [];
   for (const param in element) {
-    if (import_mixins.registry[param] && !import_mixins.parseFilters.elementKeys.includes(param)) {
+    if (import_mixins.registry[param] && !import_mixins.parseFilters.elementKeys.includes(param) || Object.hasOwnProperty.call(element, param)) {
       continue;
     }
     keys2.push(param);
@@ -178,7 +178,6 @@ function parse(excl = []) {
   const obj = {};
   const keyList = keys.call(element);
   keyList.forEach((v) => {
-    var _a;
     if (excl.includes(v))
       return;
     const val = element[v];
@@ -194,7 +193,7 @@ function parse(excl = []) {
     } else if (v === "props") {
       const { __element, update, ...props } = element[v];
       obj[v] = props;
-    } else if ((0, import_utils.isDefined)(val) && !((_a = element.context) == null ? void 0 : _a.methods[v]))
+    } else if ((0, import_utils.isDefined)(val) && Object.hasOwnProperty.call(element, v))
       obj[v] = val;
   });
   return obj;
@@ -212,9 +211,11 @@ function parseDeep(excl = []) {
   return obj;
 }
 function verbose(...args) {
+  if (ENV !== "test" && ENV !== "development")
+    return;
   const element = this;
   const { __ref: ref } = element;
-  console.group(element.key);
+  console.groupCollapsed(element.key);
   if (args.length) {
     args.forEach((v) => console.log(`%c${v}:
 `, "font-weight: bold", element[v]));
@@ -238,7 +239,10 @@ function warn(...params) {
   }
 }
 function error(...params) {
+  var _a;
   if (ENV === "test" || ENV === "development") {
+    if ((_a = params[params.length - 1]) == null ? void 0 : _a.debugger)
+      debugger;
     console.error(...params);
   }
 }

package/dist/cjs/methods/set.js

@@ -55,15 +55,13 @@ const addMethods = (element, parent, options = {}) => {
     parseDeep: import__.parseDeep,
     keys: import__.keys,
     nextElement: import__.nextElement,
-    previousElement: import__.previousElement
+    previousElement: import__.previousElement,
+    log: import__.log,
+    verbose: import__.verbose,
+    warn: import__.warn,
+    error: import__.error
   };
   if (element.context.methods)
     (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/mixins/data.js

@@ -25,8 +25,8 @@ var import_utils = require("@domql/utils");
 var import_report = require("@domql/report");
 var data_default = (params, element, node) => {
   if (params) {
-    if (element.props.attr)
-      (0, import_utils.deepMerge)(params, element.props.attr);
+    if (element.props.data)
+      (0, import_utils.deepMerge)(params, element.props.data);
     if (params.showOnNode) {
       if (!(0, import_utils.isObject)(params))
         (0, import_report.report)("HTMLInvalidData", params);

package/dist/cjs/props/create.js

@@ -43,13 +43,18 @@ const createPropsStack = (element, parent) => {
   ref.__props = propsStack;
   return propsStack;
 };
-const syncProps = (props, element) => {
+const syncProps = (props, element, opts) => {
   element.props = {};
   const mergedProps = {};
   props.forEach((v) => {
     if (import_ignore.IGNORE_PROPS_PARAMS.includes(v))
       return;
-    const execProps = (0, import_utils.exec)(v, element);
+    let execProps;
+    try {
+      execProps = (0, import_utils.exec)(v, element);
+    } catch (e) {
+      element.error(e, opts);
+    }
     element.props = (0, import_utils.deepMerge)(
       mergedProps,
       (0, import_utils.deepCloneWithExtend)(execProps, import_ignore.IGNORE_PROPS_PARAMS),
@@ -61,15 +66,15 @@ const syncProps = (props, element) => {
   Object.setPrototypeOf(element.props, methods);
   return element.props;
 };
-const createProps = function(element, parent, cached) {
+const createProps = function(element, parent, options) {
   const { __ref: ref } = element;
   const applyProps = () => {
-    const propsStack = cached || createPropsStack(element, parent);
+    const propsStack = options.cachedProps || createPropsStack(element, parent);
     if (propsStack.length) {
       ref.__props = propsStack;
       syncProps(propsStack, element);
     } else {
-      ref.__props = cached || [];
+      ref.__props = options.cachedProps || [];
       element.props = {};
     }
   };
@@ -80,7 +85,7 @@ const createProps = function(element, parent, cached) {
       applyProps();
     } catch {
       element.props = {};
-      ref.__props = cached || [];
+      ref.__props = options.cachedProps || [];
     }
   }
   const methods = { update: update.bind(element.props), __element: element };

package/dist/cjs/utils/onlyResolveExtends.js

@@ -69,7 +69,7 @@ const onlyResolveExtends = (element, parent, key, options) => {
   if (element.node && ref.__if) {
     parent[key || element.key] = element;
   }
-  (0, import_props.createProps)(element, parent);
+  (0, import_props.createProps)(element, parent, options);
   (0, import__2.applyVariant)(element, parent);
   if (element.tag !== "string" && element.tag !== "fragment") {
     (0, import_iterate.throughInitialDefine)(element);

package/methods/index.js

@@ -136,7 +136,7 @@ export function keys () {
   const element = this
   const keys = []
   for (const param in element) {
-    if (registry[param] && !parseFilters.elementKeys.includes(param)) { continue }
+    if ((registry[param] && !parseFilters.elementKeys.includes(param)) || Object.hasOwnProperty.call(element, param)) { continue }
     keys.push(param)
   }
   return keys
@@ -159,7 +159,7 @@ export function parse (excl = []) {
     } else if (v === 'props') {
       const { __element, update, ...props } = element[v]
       obj[v] = props
-    } else if (isDefined(val) && !element.context?.methods[v]) obj[v] = val
+    } else if (isDefined(val) && Object.hasOwnProperty.call(element, v)) obj[v] = val
   })
   return obj
 }
@@ -175,9 +175,11 @@ export function parseDeep (excl = []) {
 }
 
 export function verbose (...args) {
+  if (ENV !== 'test' && ENV !== 'development') return
+
   const element = this
   const { __ref: ref } = element
-  console.group(element.key)
+  console.groupCollapsed(element.key)
   if (args.length) {
     args.forEach(v => console.log(`%c${v}:\n`, 'font-weight: bold', element[v]))
   } else {
@@ -203,6 +205,7 @@ export function warn (...params) {
 
 export function error (...params) {
   if (ENV === 'test' || ENV === 'development') {
+    if (params[params.length - 1]?.debugger) debugger // eslint-disable-line
     console.error(...params)
   }
 }

package/methods/set.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isDevelopment, merge, overwrite } from '@domql/utils'
+import { merge, overwrite } from '@domql/utils'
 
 import set, { reset } from '../set'
 import update from '../update'
@@ -46,14 +46,12 @@ export const addMethods = (element, parent, options = {}) => {
     parseDeep,
     keys,
     nextElement,
-    previousElement
+    previousElement,
+    log,
+    verbose,
+    warn,
+    error
   }
   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/mixins/data.js

@@ -9,7 +9,7 @@ import { report } from '@domql/report'
  */
 export default (params, element, node) => {
   if (params) {
-    if (element.props.attr) deepMerge(params, element.props.attr)
+    if (element.props.data) deepMerge(params, element.props.data)
     if (params.showOnNode) {
       if (!isObject(params)) report('HTMLInvalidData', params)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.148",
+  "version": "2.5.150",
   "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.148",
-    "@domql/render": "^2.5.148",
-    "@domql/state": "^2.5.148",
-    "@domql/utils": "^2.5.148"
+    "@domql/event": "^2.5.150",
+    "@domql/render": "^2.5.150",
+    "@domql/state": "^2.5.150",
+    "@domql/utils": "^2.5.150"
   },
-  "gitHead": "6706914c73f3c9669ff443c0c890dea1f4e908ab",
+  "gitHead": "8e04bcc422d23520fd394f79be15dc4336cd59a6",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/props/create.js

@@ -24,13 +24,16 @@ const createPropsStack = (element, parent) => {
   return propsStack
 }
 
-export const syncProps = (props, element) => {
+export const syncProps = (props, element, opts) => {
   element.props = {}
   const mergedProps = {}
 
   props.forEach(v => {
     if (IGNORE_PROPS_PARAMS.includes(v)) return
-    const execProps = exec(v, element)
+    let execProps
+    try {
+      execProps = exec(v, element)
+    } catch (e) { element.error(e, opts) }
     // TODO: check if this failing the function props merge
     // if (isObject(execProps) && execProps.__element) return
     // it was causing infinite loop at early days
@@ -48,16 +51,16 @@ export const syncProps = (props, element) => {
   return element.props
 }
 
-export const createProps = function (element, parent, cached) {
+export const createProps = function (element, parent, options) {
   const { __ref: ref } = element
 
   const applyProps = () => {
-    const propsStack = cached || createPropsStack(element, parent)
+    const propsStack = options.cachedProps || createPropsStack(element, parent)
     if (propsStack.length) {
       ref.__props = propsStack
       syncProps(propsStack, element)
     } else {
-      ref.__props = cached || []
+      ref.__props = options.cachedProps || []
       element.props = {}
     }
   }
@@ -68,7 +71,7 @@ export const createProps = function (element, parent, cached) {
       applyProps()
     } catch {
       element.props = {}
-      ref.__props = cached || []
+      ref.__props = options.cachedProps || []
     }
   }
 

package/utils/onlyResolveExtends.js

@@ -70,7 +70,7 @@ export const onlyResolveExtends = (element, parent, key, options) => {
 
   if (element.node && ref.__if) { parent[key || element.key] = element } // Borrowed from assignNode()
 
-  createProps(element, parent)
+  createProps(element, parent, options)
   applyVariant(element, parent)
 
   if (element.tag !== 'string' && element.tag !== 'fragment') {