domql 1.4.13 → 1.4.16

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.13",
+  "version": "1.4.16",
   "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'
@@ -129,6 +129,11 @@ const create = (element, parent, key, options = {}) => {
     on.init(element.on.init, element, element.state)
   }
 
+  // run `on.init`
+  if (element.on && isFunction(element.on.beforeClassAssign)) {
+    on.beforeClassAssign(element.on.beforeClassAssign, element, element.state)
+  }
+
   // generate a CLASS name
   assignClass(element)
 

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}

@@ -87,10 +87,10 @@ export const updateProps = (newProps, element, parent) => {
   return element
 }
 
-function update (props) {
+function update (props, options) {
   const element = this.__element
   // element.update({ props })
-  element.update()
+  element.update({ props }, options)
 }
 
 export default createProps

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,
@@ -29,15 +29,7 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     // TODO: move as fragment
     const ifPassed = element.if(element, element.state)
 
-    // console.group('updateLoop')
-    // console.log(element)
-    // console.log(element.__ifFalsy)
-    // console.log(ifPassed)
-    // console.groupEnd('updateLoop')
-
-    // if (element.__ifFalsy && ifPassed) {
     if (ifPassed) delete element.__ifFalsy
-
     if (element.__ifFalsy && ifPassed) {
       createNode(element)
       appendNode(element.node, element.__ifFragment)
@@ -47,54 +39,30 @@ 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)
-  }
-
-  // console.group('update')
-  // console.log(element.path)
-  // console.log(element)
-  // if (params.props) {
-    // console.log('INSIDE:')
-    // console.log(params.props)
-  // }
-  if (!element.__ifFalsy) updateProps(params.props, element, parent)
-
-
-  // const state = params.state || element.state
-  // element.state = createState({ state }, 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)
   }
-  // const stackChanges = merge(definedChanges, merge(execChanges, overwriteChanges))
-  // if (Object.keys(stackChanges).length === 0) return
-  // else console.log(element.path, '\n\n', stackChanges)
 
-  // console.log(element.key, element.__ifFalsy)
   if (element.__ifFalsy) return element
   if (!node) {
-    return
     // return createNode(element, options)
+    return
   }
 
-  // console.warn(element.key)
-  // console.groupEnd('update')
+  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]
 
-    // console.group('updateLoop')
-    // console.log(param)
-    // console.log(prop)
-    // console.groupEnd('updateLoop')
-    // if (element.key === 'span' && param === 'node') debugger
-
     if (options.preventContentUpdate && param === 'content') continue
     if (isMethod(param) || isObject(registry[param]) || prop === undefined) continue
 

package/src/event/on.js

@@ -1,5 +1,9 @@
 'use strict'
 
+export const beforeClassAssign = (param, element, state) => {
+  param(element, state)
+}
+
 export const init = (param, element, state) => {
   param(element, state)
 }