domql 1.5.27 → 1.5.29

package/package.json

@@ -3,7 +3,7 @@
   "description": "DOM rendering Javascript framework at early stage.",
   "private": false,
   "author": "rackai",
-  "version": "1.5.27",
+  "version": "1.5.29",
   "repository": "https://github.com/rackai/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/src/element/create.js

@@ -9,29 +9,23 @@ import set, { removeContentElement } from './set'
 import createState from './state'
 import createProps from './props'
 import update from './update'
-import * as on from '../event/on'
+import { on, is } from '../event'
 import { assignClass } from './mixins/classList'
 import { isFunction, isNumber, isString, createID, isNode, exec, isArray } from '../utils'
 import { remove, lookup, setProps, log, keys, parse, parseDeep, spotByPath } from './methods'
 import cacheNode from './cache'
 import { registry } from './mixins'
+import OPTIONS from './options'
 // import { overwrite, clone, fillTheRest } from '../utils'
 
 const ENV = process.env.NODE_ENV
 
-const isComponent = (key) => {
-  const isFirstKeyString = isString(key)
-  if(!isFirstKeyString) return
-
-  const firstCharKey = key.slice(0, 1)
-
-  return /^[A-Z]*$/.test(firstCharKey)
-}
-
 /**
  * Creating a domQL element using passed parameters
  */
-const create = (element, parent, key, options = {}) => {
+const create = (element, parent, key, options = OPTIONS.create || {}) => {
+  if (options && !OPTIONS.create) OPTIONS.create = options
+
   // if ELEMENT is not given
   if (element === undefined) {
     if (ENV === 'test' || ENV === 'development')
@@ -63,7 +57,7 @@ const create = (element, parent, key, options = {}) => {
 
   const { extend, props, state, childExtend, childProps } = element
 
-  if (isComponent(assignedKey)) {
+  if (isKeyComponent(assignedKey)) {
     if (!extend && !childExtend && !props && !state || childProps) {
       element = {
         extend: assignedKey.split('_')[0],
@@ -154,7 +148,6 @@ const create = (element, parent, key, options = {}) => {
     element.log = log
   }
 
-
   // enable STATE
   element.state = createState(element, parent)
 
@@ -208,4 +201,13 @@ const create = (element, parent, key, options = {}) => {
   return element
 }
 
+const isKeyComponent = (key) => {
+  const isFirstKeyString = isString(key)
+  if(!isFirstKeyString) return
+
+  const firstCharKey = key.slice(0, 1)
+
+  return /^[A-Z]*$/.test(firstCharKey)
+}
+
 export default create

package/src/element/extend.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isFunction, exec, getExtendStack, jointStacks, cloneAndMergeArrayExtend, deepMergeExtend } from '../utils'
+import { isFunction, exec, getExtendStack, jointStacks, cloneAndMergeArrayExtend, deepMergeExtend, isString } from '../utils'
 
 const ENV = process.env.NODE_ENV
 
@@ -12,6 +12,7 @@ export const applyExtend = (element, parent, options = {}) => {
   if (isFunction(element)) element = exec(element, parent)
 
   const { extend } = element
+  if (isString(extend)) extend = options.components[extend]
   const extendStack = getExtendStack(extend)
 
   if (ENV !== 'test' || ENV !== 'development') delete element.extend
@@ -22,6 +23,12 @@ export const applyExtend = (element, parent, options = {}) => {
     element.parent = parent
     if (!options.ignoreChildExtend) {
       childExtendStack = getExtendStack(parent.childExtend)
+
+      if (parent.childExtendRecursive) {
+        const childExtendRecursiveStack = getExtendStack(parent.childExtendRecursive)
+        childExtendStack = childExtendStack.concat(childExtendRecursiveStack)
+        element.childExtendRecursive = parent.childExtendRecursive
+      }
     }
   }
 

package/src/element/mixins/registry.js

@@ -23,6 +23,7 @@ export default {
 
   extend: {},
   childExtend: {},
+  childExtendRecursive: {},
   props: {},
   path: {},
   if: {},

package/src/element/options.js

@@ -0,0 +1,3 @@
+'use strict'
+
+export default {}

package/src/element/set.js

@@ -3,6 +3,7 @@
 import create from './create'
 import { isEqualDeep, isFunction } from '../utils'
 import { registry } from './mixins'
+import OPTIONS from './options'
 
 export const removeContentElement = function (el) {
   const element = el || this
@@ -35,7 +36,8 @@ const set = function (params, options, el) {
     if (!childExtend && element.childExtend) params.childExtend = element.childExtend
     create(params, element, 'content', {
       ignoreChildExtend: true,
-      ...registry.defaultOptions
+      ...registry.defaultOptions,
+      ...OPTIONS.create
     })
   }
 

package/src/element/state.js

@@ -73,6 +73,11 @@ export default function (element, parent) {
     return {}
   }
 
+  // run `on.init`
+  if (element.on && isFunction(element.on.stateInit)) {
+    on.stateInit(element.on.stateInit, element, element.state)
+  }
+
   if (isFunction(state)) state = exec(state, element)
 
   const { __ref } = state

package/src/event/is.js

@@ -1,5 +1,7 @@
 'use strict'
 
+import { isString } from '../utils'
+
 export const node = (node) => {
   const { Node } = window
   return (
@@ -11,3 +13,4 @@ export const node = (node) => {
         typeof node.tag === 'string'
   )
 }
+

package/src/event/on.js

@@ -20,6 +20,10 @@ export const attachNode = (param, element, state) => {
   param(element, state)
 }
 
+export const stateInit = (param, element, state) => {
+  param(element, state)
+}
+
 export const stateCreated = (param, element, state) => {
   param(element, state)
 }