@domql/element 2.5.70 → 2.5.72

package/create.js

@@ -218,7 +218,7 @@ const renderElement = (element, parent, options, attachOptions) => {
   try {
     createNode(element, options)
   } catch (e) {
-    if (ENV === 'test' || ENV === 'development') console.warn(e)
+    if (ENV === 'test' || ENV === 'development') console.warn(element, e)
   }
 
   if (!ref.__if) {
@@ -315,54 +315,25 @@ const addCaching = (element, parent) => {
 
 const onlyResolveExtends = (element, parent, key, options) => {
   const { __ref: ref } = element
+  const { __ref: parentRef } = parent
   if (!ref.__skipCreate) {
-    element.tag = detectTag(element)
-
-    // if (!element.props) element.props = {}
-
-    // Copy-paste of addCaching()
-    // enable CACHING
-    if (!ref.__cached) ref.__cached = {}
-    if (!ref.__defineCache) ref.__defineCache = {}
-
-    // enable EXEC
-    if (!ref.__exec) ref.__exec = {}
-
-    // enable CLASS CACHING
-    if (!ref.__class) ref.__class = {}
-    if (!ref.__classNames) ref.__classNames = {}
-
-    // enable CLASS CACHING
-    if (!ref.__attr) ref.__attr = {}
-
-    // enable CHANGES storing
-    if (!ref.__changes) ref.__changes = []
-
-    // enable CHANGES storing
-    if (!ref.__children) ref.__children = []
-
-    // Add root element property
-    // const hasRoot = parent && parent.key === ':root'
-    // if (!ref.root) ref.root = hasRoot ? element : parentRef.root
+    addCaching(element, parent)
 
     addMethods(element, parent)
 
+    createScope(element, parent)
+
     createState(element, parent)
+    if (element.scope === 'state') element.scope = element.state
 
-    // Borrowed from createIfConditionFlag()
-    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
-    /// ///
+    createIfConditionFlag(element, parent)
+
+    // apply props settings
+    createProps(element, parent)
+    if (element.scope === 'props' || element.scope === true) element.scope = element.props
 
     if (element.node && ref.__if) { parent[key || element.key] = element } // Borrowed from assignNode()
 
-    createProps(element, parent)
     if (!element.props) element.props = {}
     applyVariant(element, parent)
   }

package/dist/cjs/create.js

@@ -170,7 +170,7 @@ const renderElement = (element, parent, options, attachOptions) => {
     (0, import_node.default)(element, options);
   } catch (e) {
     if (ENV === "test" || ENV === "development")
-      console.warn(e);
+      console.warn(element, e);
   }
   if (!ref.__if) {
     parent[key || element.key] = element;
@@ -244,38 +244,21 @@ const addCaching = (element, parent) => {
 };
 const onlyResolveExtends = (element, parent, key, options) => {
   const { __ref: ref } = element;
+  const { __ref: parentRef } = parent;
   if (!ref.__skipCreate) {
-    element.tag = (0, import_render.detectTag)(element);
-    if (!ref.__cached)
-      ref.__cached = {};
-    if (!ref.__defineCache)
-      ref.__defineCache = {};
-    if (!ref.__exec)
-      ref.__exec = {};
-    if (!ref.__class)
-      ref.__class = {};
-    if (!ref.__classNames)
-      ref.__classNames = {};
-    if (!ref.__attr)
-      ref.__attr = {};
-    if (!ref.__changes)
-      ref.__changes = [];
-    if (!ref.__children)
-      ref.__children = [];
+    addCaching(element, parent);
     (0, import_set.addMethods)(element, parent);
+    createScope(element, parent);
     (0, import_state.createState)(element, parent);
-    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;
+    if (element.scope === "state")
+      element.scope = element.state;
+    createIfConditionFlag(element, parent);
+    (0, import_props.createProps)(element, parent);
+    if (element.scope === "props" || element.scope === true)
+      element.scope = element.props;
     if (element.node && ref.__if) {
       parent[key || element.key] = element;
     }
-    (0, import_props.createProps)(element, parent);
     if (!element.props)
       element.props = {};
     (0, import_component.applyVariant)(element, parent);

package/dist/cjs/set.js

@@ -59,7 +59,9 @@ const set = function(params, options = {}, el) {
   if (options.preventContentUpdate === true && !hasCollection)
     return;
   if (ref.__noCollectionDifference || __contentRef && __contentRef.__cached && (0, import_utils.deepContains)(params, content)) {
-    return content == null ? void 0 : content.update();
+    if (content == null ? void 0 : content.update)
+      content.update();
+    return;
   }
   if (params) {
     const { childExtend } = params;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.70",
+  "version": "2.5.72",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "2b5a18c63d6037ad465f1dc7031b8f7e5f73938a",
+  "gitHead": "08604718a10463296d269e62b11b26091ff67085",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/set.js

@@ -30,8 +30,8 @@ const set = function (params, options = {}, el) {
   if (options.preventContentUpdate === true && !hasCollection) return
 
   if (ref.__noCollectionDifference || (__contentRef && __contentRef.__cached && deepContains(params, content))) {
-    return content?.update()
-    // return
+    if (content?.update) content.update()
+    return
   }
 
   if (params) {