@domql/element 2.5.18 → 2.5.19

package/create.js

@@ -45,6 +45,8 @@ const ENV = process.env.NODE_ENV
 const create = (element, parent, key, options = OPTIONS.create || {}) => {
   cacheOptions(element, options)
 
+  // if (key === 'Title') debugger
+
   // if element is STRING
   if (checkIfPrimitive(element)) {
     element = applyValueAsText(element, parent, key)

package/dist/cjs/mixins/text.js

@@ -18,34 +18,17 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var text_exports = {};
 __export(text_exports, {
-  asd: () => asd,
   default: () => text_default
 });
 module.exports = __toCommonJS(text_exports);
 var import__ = require("..");
 var import_utils = require("@domql/utils");
-const asd = (param, element, node) => {
-  const prop = (0, import_utils.exec)(param, element);
-  if (element.tag === "string") {
-    node.nodeValue = prop;
-  } else if (param !== void 0 || param !== null) {
-    if (element.__text && element.__text.text !== prop)
-      return;
-    element.__text.text = prop;
-    if (element.__text.node)
-      element.__text.node.nodeValue = prop;
-    else
-      (0, import__.create)({ tag: "string", text: prop }, element, "__text");
-  }
-};
 var text_default = (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);
   }
   if (element.tag === "string") {
-    if (element.text === prop)
-      return;
     node.nodeValue = prop;
   } else if (param !== void 0 || param !== null) {
     if (element.__text) {

package/dist/cjs/node.js

@@ -60,25 +60,25 @@ const createNode = (element, options) => {
     if ((0, import_utils.isFunction)(node.setAttribute))
       node.setAttribute("key", element.key);
   }
-  if (element.tag !== "string" || element.tag !== "fragment") {
-    (0, import_iterate.throughInitialDefine)(element);
-    (0, import_iterate.throughInitialExec)(element);
+  (0, import_iterate.throughInitialDefine)(element);
+  (0, import_iterate.throughInitialExec)(element);
+  if (element.tag !== "string" && element.tag !== "fragment") {
     if (isNewNode && (0, import_utils.isObject)(element.on))
       (0, import_event.applyEventsOnNode)(element);
-    for (const param in element) {
-      const prop = element[param];
-      if ((0, import_utils.isUndefined)(prop) || (0, import_methods.isMethod)(param) || (0, import_utils2.isVariant)(param) || (0, import_utils.isObject)(import_mixins.registry[param]))
-        continue;
-      const isElement = (0, import_applyParam.applyParam)(param, element, options);
-      if (isElement) {
-        const { hasDefine, hasContextDefine } = isElement;
-        if (element[param] && !hasDefine && !hasContextDefine) {
-          const createAsync = () => (0, import_create.default)((0, import_utils.exec)(prop, element), element, param, options);
-          if (element.props && element.props.lazyLoad || options.lazyLoad) {
-            window.requestAnimationFrame(() => createAsync());
-          } else
-            createAsync();
-        }
+  }
+  for (const param in element) {
+    const value = element[param];
+    if ((0, import_utils.isUndefined)(value) || (0, import_methods.isMethod)(param) || (0, import_utils2.isVariant)(param) || (0, import_utils.isObject)(import_mixins.registry[param]))
+      continue;
+    const isElement = (0, import_applyParam.applyParam)(param, element, options);
+    if (isElement) {
+      const { hasDefine, hasContextDefine } = isElement;
+      if (element[param] && !hasDefine && !hasContextDefine) {
+        const createAsync = () => (0, import_create.default)((0, import_utils.exec)(value, element), element, param, options);
+        if (element.props && element.props.lazyLoad || options.lazyLoad) {
+          window.requestAnimationFrame(() => createAsync());
+        } else
+          createAsync();
       }
     }
   }

package/dist/cjs/utils/component.js

@@ -48,25 +48,29 @@ const addAdditionalExtend = (newExtend, element) => {
   };
 };
 const extendizeByKey = (element, parent, key) => {
-  const { extend, props, state, childExtend, childProps, on, if: condition } = element;
+  const { tag, extend, props, state, childExtend, childProps, on, if: condition } = element;
   const hasComponentAttrs = extend || childExtend || props || state || on || condition;
   const componentKey = key.includes("_") ? key.split("_")[0] : key.includes(".") ? key.split(".")[0] : key;
   const extendKey = componentKey || key;
   if (!hasComponentAttrs || childProps) {
     return {
       extend: extendKey,
+      tag,
       props: { ...element }
     };
   } else if (!extend || extend === true) {
     return {
       ...element,
+      tag,
       extend: extendKey
     };
   } else if (extend) {
     addAdditionalExtend(extendKey, element);
   } else if ((0, import_utils.isFunction)(element)) {
+    console.log(element);
     return {
       extend: extendKey,
+      tag,
       props: { ...(0, import_utils.exec)(element, parent) }
     };
   }

package/mixins/text.js

@@ -11,25 +11,12 @@ import {
  * Creates a text node and appends into
  * an original one as a child
  */
-export const asd = (param, element, node) => {
-  const prop = exec(param, element)
-  if (element.tag === 'string') {
-    node.nodeValue = prop
-  } else if (param !== undefined || param !== null) {
-    if (element.__text && element.__text.text !== prop) return
-    element.__text.text = prop
-    if (element.__text.node) element.__text.node.nodeValue = prop
-    else create({ tag: 'string', text: prop }, element, '__text')
-  }
-}
-
 export default (param, element, node) => {
   let prop = exec(param, element)
   if (isString(prop) && prop.includes('{{')) {
     prop = replaceLiteralsWithObjectFields(prop, element.state)
   }
   if (element.tag === 'string') {
-    if (element.text === prop) return
     node.nodeValue = prop
   } else if (param !== undefined || param !== null) {
     if (element.__text) {

package/node.js

@@ -44,37 +44,36 @@ export const createNode = (element, options) => {
     if (isFunction(node.setAttribute)) node.setAttribute('key', element.key)
   }
 
-  // iterate through all given params
-  if (element.tag !== 'string' || element.tag !== 'fragment') {
-    // iterate through define
-    throughInitialDefine(element)
+  // iterate through define
+  throughInitialDefine(element)
 
-    // iterate through exec
-    throughInitialExec(element)
+  // iterate through exec
+  throughInitialExec(element)
 
+  if (element.tag !== 'string' && element.tag !== 'fragment') {
     // apply events
     if (isNewNode && isObject(element.on)) applyEventsOnNode(element)
+  }
 
-    for (const param in element) {
-      const prop = element[param]
-
-      if (
-        isUndefined(prop) ||
-        isMethod(param) ||
-        isVariant(param) ||
-        isObject(registry[param])
-      ) continue
-
-      const isElement = applyParam(param, element, options)
-      if (isElement) {
-        const { hasDefine, hasContextDefine } = isElement
-        if (element[param] && !hasDefine && !hasContextDefine) {
-          const createAsync = () => create(exec(prop, element), element, param, options)
-
-          if ((element.props && element.props.lazyLoad) || options.lazyLoad) {
-            window.requestAnimationFrame(() => createAsync())
-          } else createAsync()
-        }
+  for (const param in element) {
+    const value = element[param]
+
+    if (
+      isUndefined(value) ||
+      isMethod(param) ||
+      isVariant(param) ||
+      isObject(registry[param])
+    ) continue
+
+    const isElement = applyParam(param, element, options)
+    if (isElement) {
+      const { hasDefine, hasContextDefine } = isElement
+      if (element[param] && !hasDefine && !hasContextDefine) {
+        const createAsync = () => create(exec(value, element), element, param, options)
+
+        if ((element.props && element.props.lazyLoad) || options.lazyLoad) {
+          window.requestAnimationFrame(() => createAsync())
+        } else createAsync()
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.18",
+  "version": "2.5.19",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "4aeead0b153d4cd5430694ecf45a5d3052f9f9f5",
+  "gitHead": "94b0e44e5e5a20b0a78459b3a31eb3f7afa1c7e6",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/utils/component.js

@@ -21,7 +21,7 @@ export const addAdditionalExtend = (newExtend, element) => {
 }
 
 export const extendizeByKey = (element, parent, key) => {
-  const { extend, props, state, childExtend, childProps, on, if: condition } = element
+  const { tag, extend, props, state, childExtend, childProps, on, if: condition } = element
   const hasComponentAttrs = extend || childExtend || props || state || on || condition
   const componentKey = key.includes('_')
     ? key.split('_')[0]
@@ -31,18 +31,22 @@ export const extendizeByKey = (element, parent, key) => {
   if (!hasComponentAttrs || childProps) {
     return {
       extend: extendKey,
+      tag,
       props: { ...element }
     }
   } else if (!extend || extend === true) {
     return {
       ...element,
+      tag,
       extend: extendKey
     }
   } else if (extend) {
     addAdditionalExtend(extendKey, element)
   } else if (isFunction(element)) {
+    console.log(element)
     return {
       extend: extendKey,
+      tag,
       props: { ...exec(element, parent) }
     }
   }