domql 1.5.0 → 1.5.3

package/package.json

@@ -3,7 +3,7 @@
   "description": "DOM rendering Javascript framework at early stage.",
   "private": false,
   "author": "rackai",
-  "version": "1.5.0",
+  "version": "1.5.3",
   "repository": "https://github.com/rackai/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -31,14 +31,14 @@
     "@babel/preset-env": "^7.16.4",
     "@emotion/css": "^11.10.0",
     "@parcel/babel-preset-env": "^2.0.1",
-    "babel-jest": "^28.1.3",
-    "esbuild": "^0.14.47",
+    "babel-jest": "^29.0.0",
+    "esbuild": "^0.15.5",
     "eslint": "^8.4.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-jest": "^26.8.2",
     "eslint-plugin-node": "^11.1.0",
-    "jest": "^27.4.4",
+    "jest": "^29.0.0",
     "jsdom": "^19.0.0",
     "nodemon": "^2.0.6",
     "np": "^7.2.0",

package/src/element/create.js

@@ -3,7 +3,7 @@
 import root from './root'
 import createNode from './node'
 import { appendNode, assignNode } from './assign'
-import { applyExtendtype } from './extend'
+import { applyExtend } from './extend'
 import nodes from './nodes'
 import set from './set'
 import createState from './state'
@@ -56,9 +56,8 @@ const create = (element, parent, key, options = {}) => {
     }
   }
 
-  // create PROTOtypal inheritance
-
-  applyExtendtype(element, parent, options)
+  // create EXTEND inheritance
+  applyExtend(element, parent, options)
 
   if (Object.keys(options).length) {
     registry.defaultOptions = options
@@ -137,12 +136,6 @@ const create = (element, parent, key, options = {}) => {
   // generate a CLASS name
   assignClass(element)
 
-  // console.group('create')
-  // console.log(element.path)
-  // console.log(element)
-  // console.groupEnd('create')
-  // if (parent.key === 'footer' && key === '0') debugger
-
   // CREATE a real NODE
   createNode(element, options)
 

package/src/element/extend.js

@@ -8,7 +8,7 @@ const ENV = process.env.NODE_ENV
  * Checks whether element has `extend` or is a part
  * of parent's `childExtend` extend
  */
-export const applyExtendtype = (element, parent, options = {}) => {
+export const applyExtend = (element, parent, options = {}) => {
   if (isFunction(element)) element = exec(element, parent)
 
   const { extend } = element

package/src/element/mixins/registry.js

@@ -22,9 +22,9 @@ export default {
   state,
 
   extend: {},
+  childExtend: {},
   props: {},
   path: {},
-  childExtend: {},
   if: {},
   define: {},
   transform: {},

package/src/element/set.js

@@ -1,6 +1,7 @@
 'use strict'
 
 import create from './create'
+import { isEqualDeep } from '../utils'
 import { registry } from './mixins'
 
 const removeContentElement = (params, element) => {
@@ -11,8 +12,9 @@ const removeContentElement = (params, element) => {
     }
 
     if (element.__cached && element.__cached.content) {
+      console.log(element.__cached.content)
       if (element.__cached.content.tag === 'fragment') element.__cached.content.parent.node.innerHTML = ''
-      else element.__cached.content.remove()
+      else if (element.__cached.content) element.__cached.content?.remove()
     }
 
     delete element.content
@@ -22,6 +24,9 @@ const removeContentElement = (params, element) => {
 const set = function (params, options) {
   const element = this
 
+  const isEqual = isEqualDeep(params, element.content)
+  if (isEqual && element.content.__cached) return element
+
   removeContentElement(params, element)
 
   if (params) {
@@ -38,11 +43,3 @@ const set = function (params, options) {
 
 export default set
 
-// if (element.content && (isFunction(element.content) || element.content.node)) {
-//   // leave(element, () => {
-//   // console.log('remove', element.content)
-//   // element.content.remove()
-//   // element.content.update(params)
-//   // element.node.removeChild(element.content.node)
-//   // delete element.content
-// }

package/src/element/state.js

@@ -45,6 +45,7 @@ export default function (element, parent) {
   state.__element = element
   state.parse = parseState
   state.update = updateState
+  state.parent = element.parent.state
 
   // run `on.stateCreated`
   if (element.on && isFunction(element.on.stateCreated)) {

package/src/utils/object.js

@@ -115,6 +115,26 @@ export const deepClone = (obj, excluding = ['parent', 'node', '__element', '__ro
   return o
 }
 
+/**
+ * Overwrites object properties with another
+ */
+export const isEqualDeep = (param, element) => {
+  if (param === element) return true
+  if (!param || !element) return false
+  for (const prop in param) {
+    const paramProp = param[prop]
+    const elementProp = element[prop]
+    if (isObjectLike(paramProp)) {
+      const isEqual = isEqualDeep(paramProp, elementProp)
+      if (!isEqual) return false
+    } else {
+      const isEqual = paramProp === elementProp
+      if (!isEqual) return false
+    }
+  }
+  return true
+}
+
 /**
  * Overwrites object properties with another
  */