domql 1.4.14 → 1.4.17

package/README.md

@@ -7,14 +7,12 @@ DOM rendering Javascript framework.
 - No transpilations, simple ES6 code
 - One-time import and subtrees
 
-You can start with [starter-kit](https://github.com/rackai/starter-kit) as a boilerplate, or jump into the [playground](https://domql.com/playground/).
+You can start with [starter-kit](https://github.com/domql/starter-kit) as a boilerplate, or jump into the [playground](https://domql.com/playground/).
 
-[![npm version](https://badge.fury.io/js/%40rackai%2Fdomql.svg)](https://badge.fury.io/js/%40rackai%2Fdomql)
-[![Build Status](https://travis-ci.org/rackai/domql.svg?branch=master)](https://travis-ci.org/rackai/domql)
-[![Coverage Status](https://coveralls.io/repos/github/rackai/domql/badge.svg?branch=main)](https://coveralls.io/github/rackai/domql?branch=main)
+[![npm version](https://badge.fury.io/js/domql.svg)](https://badge.fury.io/js/domql)
 
 ```javascript
-import DOM from '@rackai/domql'
+import DOM from 'domql'
 
 DOM.create({ text: 'Rendered' })
 ```

package/package.json

@@ -3,7 +3,7 @@
   "description": "DOM rendering Javascript framework at early stage.",
   "private": false,
   "author": "rackai",
-  "version": "1.4.14",
+  "version": "1.4.17",
   "repository": "https://github.com/rackai/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -30,7 +30,7 @@
     "@babel/eslint-parser": "^7.16.3",
     "@babel/preset-env": "^7.16.4",
     "@parcel/babel-preset-env": "^2.0.1",
-    "babel-jest": "^27.4.4",
+    "babel-jest": "^28.1.3",
     "esbuild": "^0.14.47",
     "eslint": "^8.4.0",
     "eslint-config-standard": "^16.0.3",

package/src/element/create.js

@@ -1,13 +1,13 @@
 'use strict'
 
 import root from './root'
-import createNode from './createNode'
+import createNode from './node'
 import { appendNode, assignNode } from './assign'
 import { applyPrototype } from './proto'
 import nodes from './nodes'
 import set from './set'
-import createState from './createState'
-import createProps from './createProps'
+import createState from './state'
+import createProps from './props'
 import update from './update'
 import * as on from '../event/on'
 import { assignClass } from './mixins/classList'

package/src/element/index.js

@@ -5,7 +5,7 @@ import root from './root'
 import tree from './tree'
 import cache from './cache'
 import create from './create'
-import createNode from './createNode'
+import createNode from './node'
 import * as assign from './assign'
 import define from './define'
 import update from './update'

package/src/element/{createProps.js → props.js}

@@ -14,6 +14,8 @@ const initProps = (element, parent) => {
     return propValue
   }
 
+  if (matchParent && props !== 'match') propsStack.push(matchParent)
+
   if (isObject(props)) {
     propsStack.push(props)
   } else if (props === 'inherit') {
@@ -23,7 +25,6 @@ const initProps = (element, parent) => {
     let matchParentValue
     //console.log('hasArg', hasArg)
     if (hasArg[1] && parent.props[hasArg[1]]) {
-      console.log('hasArg[1]', hasArg[1])
       const secondArgasParentMatchProp = parent.props[hasArg[1]]
       propsStack.push(
         objectizeStringProperty(secondArgasParentMatchProp)
@@ -36,8 +37,6 @@ const initProps = (element, parent) => {
     propsStack.push(matchParentValue)
   } else if (props) propsStack.push(props)
 
-  if (matchParent && props !== 'match') propsStack.push(matchParent)
-
   if (isArray(element.__proto)) {
     element.__proto.map(proto => {
       if (proto.props) propsStack.push(proto.props)

package/src/element/update.js

@@ -8,8 +8,8 @@ import { throughUpdatedDefine, throughUpdatedExec } from './iterate'
 import { merge } from '../utils/object'
 import { appendNode } from './assign'
 import { createNode } from '.'
-import { updateProps } from './createProps'
-import createState from './createState'
+import { updateProps } from './props'
+import createState from './state'
 
 const UPDATE_DEFAULT_OPTIONS = {
   stackChanges: false,
@@ -39,17 +39,13 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     }
   }
 
-  if (element.on && isFunction(element.on.initUpdate) && !options.ignoreInitUpdate) {
-    preventUpdate = on.initUpdate(element.on.initUpdate, element, element.state)
-  }
-
-  if (!element.__ifFalsy) updateProps(params.props, element, parent)
+  if (!element.__ifFalsy && !options.preventPropsUpdate) updateProps(params.props, element, parent)
 
   const overwriteChanges = overwrite(element, params, UPDATE_DEFAULT_OPTIONS)
   const execChanges = throughUpdatedExec(element, UPDATE_DEFAULT_OPTIONS)
   const definedChanges = throughUpdatedDefine(element)
 
-  if (UPDATE_DEFAULT_OPTIONS.stackChanges && element.__stackChanges) {
+  if (options.stackChanges && element.__stackChanges) {
     const stackChanges = merge(definedChanges, merge(execChanges, overwriteChanges))
     element.__stackChanges.push(stackChanges)
   }
@@ -60,6 +56,10 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     return
   }
 
+  if (element.on && isFunction(element.on.initUpdate) && !options.ignoreInitUpdate) {
+    preventUpdate = on.initUpdate(element.on.initUpdate, element, element.state)
+  }
+
   for (const param in element) {
     const prop = element[param]