@domql/element 2.5.52 → 2.5.53

package/create.js

@@ -34,6 +34,7 @@ import {
   applyKeyComponentAsExtend,
   applyVariant,
   checkIfKeyIsComponent,
+  createValidDomqlObjectFromSugar,
   isVariant
 } from './utils/component'
 
@@ -151,7 +152,9 @@ const createBasedOnType = (element, parent, key, options) => {
 const redefineElement = (element, parent, key, options) => {
   const elementWrapper = createBasedOnType(element, parent, key, options)
 
-  if (checkIfKeyIsComponent(key)) {
+  if (options.syntaxv3 || element.props?.syntaxv3) {
+    return createValidDomqlObjectFromSugar(element, parent, key, options)
+  } else if (checkIfKeyIsComponent(key)) {
     return applyKeyComponentAsExtend(elementWrapper, parent, key)
   }
 

package/dist/cjs/create.js

@@ -115,8 +115,11 @@ const createBasedOnType = (element, parent, key, options) => {
   return element;
 };
 const redefineElement = (element, parent, key, options) => {
+  var _a;
   const elementWrapper = createBasedOnType(element, parent, key, options);
-  if ((0, import_component.checkIfKeyIsComponent)(key)) {
+  if (options.syntaxv3 || ((_a = element.props) == null ? void 0 : _a.syntaxv3)) {
+    return (0, import_component.createValidDomqlObjectFromSugar)(element, parent, key, options);
+  } else if ((0, import_component.checkIfKeyIsComponent)(key)) {
     return (0, import_component.applyKeyComponentAsExtend)(elementWrapper, parent, key);
   }
   if (checkIfMedia(key)) {

package/dist/cjs/utils/component.js

@@ -34,7 +34,19 @@ module.exports = __toCommonJS(component_exports);
 var import_utils = require("@domql/utils");
 var import_extend = require("../extend");
 const ENV = "development";
-const DOMQL_BUILTINS = ["extend", "childExtend", "childExtendRecursive", "define", "props", "state", "on", "if", "attr", "key", "tag"];
+const DOMQL_BUILTINS = [
+  "extend",
+  "childExtend",
+  "childExtendRecursive",
+  "define",
+  "props",
+  "state",
+  "on",
+  "if",
+  "attr",
+  "key",
+  "tag"
+];
 const checkIfKeyIsComponent = (key) => {
   const isFirstKeyString = (0, import_utils.isString)(key);
   if (!isFirstKeyString)
@@ -57,7 +69,7 @@ const addAdditionalExtend = (newExtend, element) => {
   return { ...element, extend };
 };
 const replaceOnKeys = (key) => key.replace(/on\w+/g, (match) => match.substring(2));
-const createValidDomqlObjectFromSugar = (el) => {
+const createValidDomqlObjectFromSugar = (el, parent, key, options) => {
   const newElem = {
     props: {},
     on: {}
@@ -72,6 +84,10 @@ const createValidDomqlObjectFromSugar = (el) => {
     } else if (!isMethod && checkIfKeyIsProperty(k)) {
       if (!DOMQL_BUILTINS.includes(k))
         newElem.props[k] = prop;
+    } else if (checkIfKeyIsComponent(k)) {
+      newElem[k] = prop;
+    } else {
+      newElem[k] = prop;
     }
   }
   return newElem;

package/package.json

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

package/utils/component.js

@@ -4,7 +4,19 @@ import { exec, isArray, isFunction, isObject, isString, joinArrays, overwriteDee
 import { applyExtend } from '../extend'
 const ENV = process.env.NODE_ENV
 
-const DOMQL_BUILTINS = ['extend', 'childExtend', 'childExtendRecursive', 'define', 'props', 'state', 'on', 'if', 'attr', 'key', 'tag']
+const DOMQL_BUILTINS = [
+  'extend',
+  'childExtend',
+  'childExtendRecursive',
+  'define',
+  'props',
+  'state',
+  'on',
+  'if',
+  'attr',
+  'key',
+  'tag'
+]
 
 export const checkIfKeyIsComponent = (key) => {
   const isFirstKeyString = isString(key)
@@ -12,6 +24,7 @@ export const checkIfKeyIsComponent = (key) => {
   const firstCharKey = key.slice(0, 1)
   return /^[A-Z]*$/.test(firstCharKey)
 }
+
 export const checkIfKeyIsProperty = (key) => {
   const isFirstKeyString = isString(key)
   if (!isFirstKeyString) return
@@ -29,7 +42,7 @@ export const addAdditionalExtend = (newExtend, element) => {
 
 const replaceOnKeys = key => key.replace(/on\w+/g, match => match.substring(2))
 
-export const createValidDomqlObjectFromSugar = el => {
+export const createValidDomqlObjectFromSugar = (el, parent, key, options) => {
   const newElem = {
     props: {},
     on: {}
@@ -43,6 +56,10 @@ export const createValidDomqlObjectFromSugar = el => {
       newElem.on[onKey] = prop
     } else if (!isMethod && checkIfKeyIsProperty(k)) {
       if (!DOMQL_BUILTINS.includes(k)) newElem.props[k] = prop
+    } else if (checkIfKeyIsComponent(k)) {
+      newElem[k] = prop
+    } else {
+      newElem[k] = prop
     }
   }
   return newElem