domql 1.5.120 → 1.5.122

package/package.json

@@ -2,7 +2,7 @@
   "name": "domql",
   "description": "DOM rendering Javascript framework at early stage.",
   "author": "symbo.ls",
-  "version": "1.5.120",
+  "version": "1.5.122",
   "repository": "https://github.com/domql/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -29,6 +29,7 @@
   "dependencies": {
     "@domql/globals": "latest",
     "@domql/registry": "latest",
+    "@domql/event": "latest",
     "@domql/report": "latest",
     "@domql/emotion": "latest",
     "@domql/utils": "latest",

package/src/element/create.js

@@ -2,6 +2,7 @@
 
 import { isObject, isFunction, isString, createID, isNode, exec, is } from '@domql/utils'
 import { TAGS } from '@domql/registry'
+import { triggerEventOn } from '@domql/event'
 
 import root from './root'
 import createNode from './node'
@@ -11,7 +12,6 @@ import set, { removeContentElement } from './set'
 import createState from './state'
 import createProps from './props'
 import update from './update'
-import { on } from '../event'
 import { assignClass } from './mixins/classList'
 import { remove, lookup, setProps, log, keys, parse, parseDeep, spotByPath, nextElement, previousElement, isMethod } from './methods'
 import cacheNode, { detectTag } from './cache'
@@ -113,14 +113,10 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
   if (__ref.__if) createProps(element, parent)
 
   // run `on.init`
-  if (element.on && isFunction(element.on.init)) {
-    on.init(element.on.init, element, element.state)
-  }
+  triggerEventOn('init', element)
 
   // run `on.beforeClassAssign`
-  if (element.on && isFunction(element.on.beforeClassAssign)) {
-    on.beforeClassAssign(element.on.beforeClassAssign, element, element.state)
-  }
+  triggerEventOn('beforeClassAssign', element)
 
   // generate a CLASS name
   assignClass(element)
@@ -134,14 +130,10 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
   assignNode(element, parent, key)
 
   // run `on.renderRouter`
-  if (element.on && isFunction(element.on.renderRouter)) {
-    on.render(element.on.renderRouter, element, element.state)
-  }
+  triggerEventOn('renderRouter', element)
 
   // run `on.render`
-  if (element.on && isFunction(element.on.render)) {
-    on.render(element.on.render, element, element.state)
-  }
+  triggerEventOn('render', element)
 
   if (parent.__ref && parent.__ref.__children) parent.__ref.__children.push(element.key)
   // console.groupEnd(element.key)

package/src/element/iterate.js

@@ -9,14 +9,22 @@ export const applyEvents = element => {
   for (const param in on) {
     if (
       param === 'init' ||
+      param === 'beforeClassAssign' ||
       param === 'render' ||
+      param === 'renderRouter' ||
+      param === 'attachNode' ||
+      param === 'stateInit' ||
+      param === 'stateCreated' ||
+      param === 'initStateUpdated' ||
+      param === 'stateUpdated' ||
+      param === 'initUpdate' ||
       param === 'update'
     ) continue
 
     const appliedFunction = element.on[param]
     if (isFunction(appliedFunction)) {
       node.addEventListener(param, event =>
-        appliedFunction(event, element, element.state),
+        appliedFunction(event, element, element.state, element.context),
       true)
     }
   }

package/src/element/node.js

@@ -1,9 +1,10 @@
 'use strict'
 
 import { exec, isFunction, isObject } from '@domql/utils'
+import { triggerEventOn } from '@domql/event'
+
 import create from './create'
 import cacheNode from './cache'
-import * as on from '../event/on'
 
 import {
   throughInitialDefine,
@@ -32,10 +33,8 @@ export const createNode = (element, options) => {
       node = element.node = element.parent.node.attachShadow({ mode: 'open' })
     } else node = element.node = cacheNode(element)
 
-    // run `on.attachNode`
-    if (element.on && isFunction(element.on.attachNode)) {
-      on.attachNode(element.on.attachNode, element, element.state)
-    }
+    // trigger `on.attachNode`
+    triggerEventOn('attachNode', element)
   }
 
   // node.dataset // .key = element.key

package/src/element/state.js

@@ -1,6 +1,7 @@
 'use strict'
 
 import { on } from '../event'
+import { triggerEventOn } from '@domql/event'
 import { is, isObject, exec, isFunction, isUndefined } from '@domql/utils'
 import { deepClone, overwriteShallow, overwriteDeep } from '../utils'
 
@@ -120,10 +121,8 @@ export const createState = function (element, parent, opts) {
     __elementRef.__hasRootState = true
   }
 
-  // run `on.init`
-  if (element.on && isFunction(element.on.stateInit)) {
-    on.stateInit(element.on.stateInit, element, element.state)
-  }
+  // trigger `on.stateInit`
+  triggerEventOn('stateInit', element)
 
   let stateKey = __elementRef.__state
   if (stateKey) {
@@ -191,10 +190,8 @@ export const createState = function (element, parent, opts) {
   state.__projectPages = state.__root.PROJECT_PAGES
   state.__projectSnippets = state.__root.PROJECT_SNIPPETS
 
-  // run `on.stateCreated`
-  if (element.on && isFunction(element.on.stateCreated)) {
-    on.stateCreated(element.on.stateCreated, element, state)
-  }
+  // trigger `on.stateCreated`
+  triggerEventOn('stateCreated', element)
 
   return state
 }

package/src/element/update.js

@@ -2,6 +2,7 @@
 
 import { window } from '@domql/globals'
 import { diff, isFunction, isNumber, isObject, isString, createSnapshotId } from '@domql/utils'
+import { applyEvent, triggerEventOn } from '@domql/event'
 import { merge, overwrite } from '../utils'
 
 import { on } from '../event'
@@ -58,8 +59,10 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
       if (!__ref.__hasRootState) delete element.state
       if (__ref.__state) element.state = __ref.__state
       const created = create(element, element.parent, element.key)
-      if (!options.preventUpdate && element.on && isFunction(element.on.update)) {
-        on.update(element.on.update, created, created.state)
+      if (!options.preventUpdate) {
+        if (element.on && isFunction(element.on.update)) {
+          applyEvent(element.on.update, created, created.state)
+        }
       }
       return created
     } else if (element.node && !ifPassed) {
@@ -143,8 +146,8 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     }
   }
 
-  if (!options.preventUpdate && element.on && isFunction(element.on.update)) {
-    on.update(element.on.update, element, element.state)
+  if (!options.preventUpdate) {
+    triggerEventOn('update', element)
   }
 }
 

package/src/event/on.js

@@ -1,31 +1,7 @@
 'use strict'
 
-export const beforeClassAssign = (param, element, state) => {
-  return param(element, state)
-}
-
-export const init = (param, element, state) => {
-  return param(element, state)
-}
-
-export const render = (param, element, state) => {
-  return param(element, state)
-}
-
-export const initUpdate = (param, element, state) => {
-  return param(element, state)
-}
-
-export const attachNode = (param, element, state) => {
-  return param(element, state)
-}
-
-export const stateInit = (param, element, state) => {
-  return param(element, state)
-}
-
-export const stateCreated = (param, element, state) => {
-  return param(element, state)
+export const initUpdate = (param, element, state, changes) => {
+  return param(element, state, changes)
 }
 
 export const initStateUpdated = (param, element, state, changes) => {
@@ -35,11 +11,3 @@ export const initStateUpdated = (param, element, state, changes) => {
 export const stateUpdated = (param, element, state, changes) => {
   return param(element, state, changes)
 }
-
-export const update = (param, element, state) => {
-  return param(element, state)
-}
-
-export default (param, element, state) => {
-  return param(element, state)
-}