@domql/element 2.5.6 → 2.5.7

package/create.js

@@ -294,30 +294,45 @@ const onlyResolveExtends = (element, parent, key, options) => {
 
   if (!element.props) element.props = {}
 
-  createState(element, parent, { skipApplyMethods: true, ...options })
+  createState(element, parent)
+
+  // Borrowed from createIfConditionFlag()
+  const ref = __ref
+  if (isFunction(element.if)) {
+    const ifPassed = element.if(element, element.state)
+    if (!ifPassed) {
+      // const ifFragment = cacheNode({ tag: 'fragment' })
+      // ref.__ifFragment = appendNode(ifFragment, parent.node)
+      delete ref.__if
+    } else ref.__if = true
+  } else ref.__if = true
+  //////
+
   createProps(element, parent)
   applyVariant(element, parent)
 
-  throughInitialExec(element, options.propsExcludedFromExec)
-
-  for (const param in element) {
-    const prop = element[param]
-    if (
-      isUndefined(prop) ||
-      isMethod(param) ||
-      isObject(registry[param]) ||
-      isVariant(param)
-    ) continue
-
-    const hasDefine = element.define && element.define[param]
-    const contextHasDefine = element.context && element.context.define &&
-          element.context.define[param]
-    const optionsHasDefine = options.define && options.define[param]
-
-    if (registry[param] && !optionsHasDefine) {
-      continue
-    } else if (element[param] && !hasDefine && !optionsHasDefine && !contextHasDefine) {
-      create(exec(prop, element), element, param, options)
+  if (element.tag !== 'string' || element.tag !== 'fragment') {
+    throughInitialExec(element, options.propsExcludedFromExec)
+
+    for (const param in element) {
+      const prop = element[param]
+      if (
+        isUndefined(prop) ||
+          isMethod(param) ||
+          isObject(registry[param]) ||
+          isVariant(param)
+      ) continue
+
+      const hasDefine = element.define && element.define[param]
+      const contextHasDefine = element.context && element.context.define &&
+            element.context.define[param]
+      const optionsHasDefine = options.define && options.define[param]
+
+      if (registry[param] && !optionsHasDefine) {
+        continue
+      } else if (element[param] && !hasDefine && !optionsHasDefine && !contextHasDefine) {
+        create(exec(prop, element), element, param, options)
+      }
     }
   }
 

package/dist/cjs/create.js

@@ -234,21 +234,32 @@ const onlyResolveExtends = (element, parent, key, options) => {
     __ref.__attr = {};
   if (!element.props)
     element.props = {};
-  (0, import_state.createState)(element, parent, { skipApplyMethods: true, ...options });
+  (0, import_state.createState)(element, parent);
+  const ref = __ref;
+  if ((0, import_utils.isFunction)(element.if)) {
+    const ifPassed = element.if(element, element.state);
+    if (!ifPassed) {
+      delete ref.__if;
+    } else
+      ref.__if = true;
+  } else
+    ref.__if = true;
   (0, import_props.createProps)(element, parent);
   (0, import_component.applyVariant)(element, parent);
-  (0, import_iterate.throughInitialExec)(element, options.propsExcludedFromExec);
-  for (const param in element) {
-    const prop = element[param];
-    if ((0, import_utils.isUndefined)(prop) || (0, import_methods.isMethod)(param) || (0, import_utils.isObject)(import_mixins.registry[param]) || (0, import_component.isVariant)(param))
-      continue;
-    const hasDefine = element.define && element.define[param];
-    const contextHasDefine = element.context && element.context.define && element.context.define[param];
-    const optionsHasDefine = options.define && options.define[param];
-    if (import_mixins.registry[param] && !optionsHasDefine) {
-      continue;
-    } else if (element[param] && !hasDefine && !optionsHasDefine && !contextHasDefine) {
-      create((0, import_utils.exec)(prop, element), element, param, options);
+  if (element.tag !== "string" || element.tag !== "fragment") {
+    (0, import_iterate.throughInitialExec)(element, options.propsExcludedFromExec);
+    for (const param in element) {
+      const prop = element[param];
+      if ((0, import_utils.isUndefined)(prop) || (0, import_methods.isMethod)(param) || (0, import_utils.isObject)(import_mixins.registry[param]) || (0, import_component.isVariant)(param))
+        continue;
+      const hasDefine = element.define && element.define[param];
+      const contextHasDefine = element.context && element.context.define && element.context.define[param];
+      const optionsHasDefine = options.define && options.define[param];
+      if (import_mixins.registry[param] && !optionsHasDefine) {
+        continue;
+      } else if (element[param] && !hasDefine && !optionsHasDefine && !contextHasDefine) {
+        create((0, import_utils.exec)(prop, element), element, param, options);
+      }
     }
   }
   parent[key || element.key] = element;

package/dist/cjs/mixins/registry.js

@@ -40,6 +40,7 @@ var registry_default = {
   if: {},
   define: {},
   transform: {},
+  __name: {},
   __ref: {},
   __hash: {},
   __text: {},

package/mixins/registry.js

@@ -24,6 +24,7 @@ export default {
   if: {},
   define: {},
   transform: {},
+  __name: {},
   __ref: {},
   __hash: {},
   __text: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "e05c05cdecb20e2b9e4d9ea728bb2707cb27912c",
+  "gitHead": "fe6520d996b2ca837f6965928a51360ea91e9695",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }