@domql/element 2.5.16 → 2.5.17

package/create.js

@@ -64,8 +64,10 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
 
   applyComponentFromContext(element, parent, options)
 
-  // create EXTEND inheritance
-  applyExtend(element, parent, options)
+  if (!ref.__skipCreate) {
+    // create EXTEND inheritance
+    applyExtend(element, parent, options)
+  }
 
   // create and assign a KEY
   element.key = key
@@ -287,20 +289,13 @@ const addCaching = (element, parent) => {
 }
 
 const onlyResolveExtends = (element, parent, key, options) => {
-  const { __ref } = element
-  element.tag = detectTag(element)
-
-  // if (!element.props) element.props = {}
-
-  // Copy-paste of addCaching()
-  {
-    const { __ref: ref } = element
-    const { __ref: parentRef } = parent // eslint-disable-line
+  const { __ref: ref } = element
+  if (!ref.__skipCreate) {
+    element.tag = detectTag(element)
 
-    // enable TRANSFORM in data
-    // TODO: do we need this at all?
-    // if (!element.transform) element.transform = {}
+    // if (!element.props) element.props = {}
 
+    // Copy-paste of addCaching()
     // enable CACHING
     if (!ref.__cached) ref.__cached = {}
     if (!ref.__defineCache) ref.__defineCache = {}
@@ -324,29 +319,28 @@ const onlyResolveExtends = (element, parent, key, options) => {
     // Add __root element property
     // const hasRoot = parent && parent.key === ':root'
     // if (!ref.__root) ref.__root = hasRoot ? element : parentRef.__root
-  }
 
-  addMethods(element, parent)
+    addMethods(element, parent)
 
-  createState(element, parent)
+    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
+    // 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
-  } else ref.__if = true
-  /// ///
+    /// ///
 
-  if (element.node && ref.__if) { parent[key || element.key] = element } // Borrowed from assignNode()
+    if (element.node && ref.__if) { parent[key || element.key] = element } // Borrowed from assignNode()
 
-  createProps(element, parent)
-  if (!element.props) element.props = {}
-  applyVariant(element, parent)
+    createProps(element, parent)
+    if (!element.props) element.props = {}
+    applyVariant(element, parent)
+  }
 
   if (element.tag !== 'string' && element.tag !== 'fragment') {
     throughInitialDefine(element)
@@ -365,7 +359,7 @@ const onlyResolveExtends = (element, parent, key, options) => {
             element.context.define[k]
       const optionsHasDefine = options.define && options.define[k]
 
-      if (registry[k] && !optionsHasDefine) {
+      if (!ref.__skipCreate && registry[k] && !optionsHasDefine) {
         continue
       } else if (element[k] && !hasDefine && !optionsHasDefine && !contextHasDefine) {
         create(exec(element[k], element), element, k, options)

package/dist/cjs/create.js

@@ -60,7 +60,9 @@ const create = (element, parent, key, options = import_options.default.create ||
   ref.__initialProps = (0, import_utils.deepClone)(element.props, []);
   applyContext(element, parent, options);
   (0, import_component.applyComponentFromContext)(element, parent, options);
-  (0, import_extend.applyExtend)(element, parent, options);
+  if (!ref.__skipCreate) {
+    (0, import_extend.applyExtend)(element, parent, options);
+  }
   element.key = key;
   if (options.onlyResolveExtends) {
     return onlyResolveExtends(element, parent, key, options);
@@ -226,46 +228,43 @@ const addCaching = (element, parent) => {
   }
 };
 const onlyResolveExtends = (element, parent, key, options) => {
-  const { __ref } = element;
-  element.tag = (0, import_render.detectTag)(element);
-  {
-    const { __ref: ref2 } = element;
-    const { __ref: parentRef } = parent;
-    if (!ref2.__cached)
-      ref2.__cached = {};
-    if (!ref2.__defineCache)
-      ref2.__defineCache = {};
-    if (!ref2.__exec)
-      ref2.__exec = {};
-    if (!ref2.__class)
-      ref2.__class = {};
-    if (!ref2.__classNames)
-      ref2.__classNames = {};
-    if (!ref2.__attr)
-      ref2.__attr = {};
-    if (!ref2.__changes)
-      ref2.__changes = [];
-    if (!ref2.__children)
-      ref2.__children = [];
-  }
-  (0, import_set.addMethods)(element, parent);
-  (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;
+  const { __ref: ref } = element;
+  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 = [];
+    (0, import_set.addMethods)(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;
-  } else
-    ref.__if = true;
-  if (element.node && ref.__if) {
-    parent[key || element.key] = element;
+    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);
   }
-  (0, import_props.createProps)(element, parent);
-  if (!element.props)
-    element.props = {};
-  (0, import_component.applyVariant)(element, parent);
   if (element.tag !== "string" && element.tag !== "fragment") {
     (0, import_iterate.throughInitialDefine)(element);
     (0, import_iterate.throughInitialExec)(element);
@@ -275,7 +274,7 @@ const onlyResolveExtends = (element, parent, key, options) => {
       const hasDefine = element.define && element.define[k];
       const contextHasDefine = element.context && element.context.define && element.context.define[k];
       const optionsHasDefine = options.define && options.define[k];
-      if (import_mixins.registry[k] && !optionsHasDefine) {
+      if (!ref.__skipCreate && import_mixins.registry[k] && !optionsHasDefine) {
         continue;
       } else if (element[k] && !hasDefine && !optionsHasDefine && !contextHasDefine) {
         create((0, import_utils.exec)(element[k], element), element, k, options);

package/dist/cjs/utils/extendUtils.js

@@ -124,8 +124,6 @@ const cloneAndMergeArrayExtend = (stack) => {
 const fallbackStringExtend = (extend, context, options) => {
   const COMPONENTS = context && context.components || options.components;
   if ((0, import_utils.isString)(extend)) {
-    console.log("extend", extend);
-    console.log(COMPONENTS[extend]);
     if (COMPONENTS && COMPONENTS[extend]) {
       return COMPONENTS[extend];
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.16",
+  "version": "2.5.17",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "2987c1965a4cab0258feb592d273d519260f5461",
+  "gitHead": "b08d17a7f2bf1a70714ab9f1718cbf98862becf0",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/utils/extendUtils.js

@@ -92,8 +92,6 @@ export const cloneAndMergeArrayExtend = stack => {
 export const fallbackStringExtend = (extend, context, options) => {
   const COMPONENTS = (context && context.components) || options.components
   if (isString(extend)) {
-    console.log('extend', extend)
-    console.log(COMPONENTS[extend])
     if (COMPONENTS && COMPONENTS[extend]) {
       return COMPONENTS[extend]
     } else {