@domql/element 2.5.152 → 2.5.154

package/create.js

@@ -361,6 +361,8 @@ const onlyResolveExtends = (element, parent, key, options) => {
 
     if (!element.props) element.props = {}
     applyVariant(element, parent)
+
+    addElementIntoParentChildren(element, parent)
   }
 
   if (element.tag !== 'string' && element.tag !== 'fragment') {

package/dist/cjs/create.js

@@ -292,6 +292,7 @@ const onlyResolveExtends = (element, parent, key, options) => {
     if (!element.props)
       element.props = {};
     (0, import_component.applyVariant)(element, parent);
+    addElementIntoParentChildren(element, parent);
   }
   if (element.tag !== "string" && element.tag !== "fragment") {
     (0, import_iterate.throughInitialDefine)(element);

package/dist/cjs/extend.js

@@ -29,7 +29,7 @@ const applyExtend = (element, parent, options = {}) => {
   if ((0, import_utils.isFunction)(element))
     element = (0, import_utils.exec)(element, parent);
   const { props, __ref } = element;
-  let extend = (props == null ? void 0 : props.extends) || element.extend;
+  let extend = (props == null ? void 0 : props.extends) || element.extends || element.extend;
   const context = element.context || parent.context;
   extend = (0, import_utils2.fallbackStringExtend)(extend, context, options);
   const extendStack = (0, import_utils2.getExtendStack)(extend, context);

package/dist/cjs/methods/index.js

@@ -22,6 +22,8 @@ __export(methods_exports, {
   defineSetter: () => defineSetter,
   error: () => error,
   get: () => get,
+  getPath: () => getPath,
+  getRef: () => getRef,
   isMethod: () => isMethod,
   keys: () => keys,
   log: () => log,
@@ -161,6 +163,12 @@ function setProps(param, options) {
   element.update({ props: param }, options);
   return element;
 }
+function getRef() {
+  return this.__ref;
+}
+function getPath() {
+  return this.getRef().path;
+}
 const defineSetter = (element, key, get2, set) => Object.defineProperty(element, key, { get: get2, set });
 function keys() {
   const element = this;
@@ -222,9 +230,9 @@ function verbose(...args) {
   } else {
     console.log(ref.path);
     const keys2 = element.keys();
-    keys2.forEach((v) => console.log(`%c${v}:
-`, "font-weight: bold", element[v]));
+    keys2.forEach((v) => console.log(`%c${v}:`, "font-weight: bold", element[v]));
   }
+  console.log(element);
   console.groupEnd(element.key);
   return element;
 }
@@ -310,6 +318,8 @@ const METHODS = [
   "lookup",
   "lookdown",
   "lookdownAll",
+  "getRef",
+  "getPath",
   "setNodeStyles",
   "spotByPath",
   "keys",

package/dist/cjs/methods/set.js

@@ -49,6 +49,8 @@ const addMethods = (element, parent, options = {}) => {
     lookup: import__.lookup,
     lookdown: import__.lookdown,
     lookdownAll: import__.lookdownAll,
+    getRef: import__.getRef,
+    getPath: import__.getPath,
     setNodeStyles: import__.setNodeStyles,
     spotByPath: import__.spotByPath,
     parse: import__.parse,

package/dist/cjs/mixins/registry.js

@@ -64,6 +64,8 @@ var registry_default = {
   variables: {},
   lookup: {},
   lookdown: {},
+  getRef: {},
+  getPath: {},
   lookdownAll: {},
   setNodeStyles: {},
   spotByPath: {},

package/dist/cjs/props/inherit.js

@@ -29,6 +29,7 @@ const objectizeStringProperty = (propValue) => {
   return propValue;
 };
 const inheritParentProps = (element, parent) => {
+  var _a;
   let propsStack = [];
   const parentProps = (0, import_utils.exec)(parent, parent.state).props;
   const matchParent = parent.props && parentProps[element.key];
@@ -46,7 +47,7 @@ const inheritParentProps = (element, parent) => {
       propsStack.push(objectizeStringProperty(matchParent));
     }
   }
-  if (matchParentChildProps)
+  if (matchParentChildProps && !((_a = element == null ? void 0 : element.props) == null ? void 0 : _a.ignoreChildProps))
     propsStack.push(matchParentChildProps);
   return propsStack;
 };

package/dist/cjs/utils/object.js

@@ -70,6 +70,8 @@ const METHODS = [
   "lookup",
   "lookdown",
   "lookdownAll",
+  "getRef",
+  "getPath",
   "setNodeStyles",
   "spotByPath",
   "keys",

package/extend.js

@@ -21,7 +21,7 @@ export const applyExtend = (element, parent, options = {}) => {
   if (isFunction(element)) element = exec(element, parent)
 
   const { props, __ref } = element
-  let extend = props?.extends || element.extend
+  let extend = props?.extends || element.extends || element.extend
   const context = element.context || parent.context
 
   extend = fallbackStringExtend(extend, context, options)

package/methods/index.js

@@ -123,6 +123,14 @@ export function setProps (param, options) {
   return element
 }
 
+export function getRef () {
+  return this.__ref
+}
+
+export function getPath () {
+  return this.getRef().path
+}
+
 // export function set () {
 // }
 
@@ -185,8 +193,9 @@ export function verbose (...args) {
   } else {
     console.log(ref.path)
     const keys = element.keys()
-    keys.forEach(v => console.log(`%c${v}:\n`, 'font-weight: bold', element[v]))
+    keys.forEach(v => console.log(`%c${v}:`, 'font-weight: bold', element[v]))
   }
+  console.log(element)
   console.groupEnd(element.key)
   return element
 }
@@ -275,6 +284,8 @@ export const METHODS = [
   'lookup',
   'lookdown',
   'lookdownAll',
+  'getRef',
+  'getPath',
   'setNodeStyles',
   'spotByPath',
   'keys',

package/methods/set.js

@@ -9,6 +9,8 @@ import {
   lookup,
   lookdown,
   lookdownAll,
+  getRef,
+  getPath,
   setNodeStyles,
   setProps,
   remove,
@@ -40,6 +42,8 @@ export const addMethods = (element, parent, options = {}) => {
     lookup,
     lookdown,
     lookdownAll,
+    getRef,
+    getPath,
     setNodeStyles,
     spotByPath,
     parse,

package/mixins/registry.js

@@ -48,6 +48,8 @@ export default {
   variables: {},
   lookup: {},
   lookdown: {},
+  getRef: {},
+  getPath: {},
   lookdownAll: {},
   setNodeStyles: {},
   spotByPath: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.152",
+  "version": "2.5.154",
   "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.152",
-    "@domql/render": "^2.5.152",
-    "@domql/state": "^2.5.152",
-    "@domql/utils": "^2.5.152"
+    "@domql/event": "^2.5.154",
+    "@domql/render": "^2.5.154",
+    "@domql/state": "^2.5.154",
+    "@domql/utils": "^2.5.154"
   },
-  "gitHead": "249d2545f3ee35b450ca90d399fc7c3e54a4a7bc",
+  "gitHead": "3971150df707cdc497b898f2f772946c1deb1fc1",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/props/inherit.js

@@ -28,7 +28,7 @@ export const inheritParentProps = (element, parent) => {
       propsStack.push(objectizeStringProperty(matchParent))
     }
   }
-  if (matchParentChildProps) propsStack.push(matchParentChildProps)
+  if (matchParentChildProps && !element?.props?.ignoreChildProps) propsStack.push(matchParentChildProps)
 
   return propsStack
 }

package/utils/object.js

@@ -23,6 +23,8 @@ export const METHODS = [
   'lookup',
   'lookdown',
   'lookdownAll',
+  'getRef',
+  'getPath',
   'setNodeStyles',
   'spotByPath',
   'keys',