update

一小波优化

.gitignore

@@ -1,12 +1,9 @@
 *.min.js
 .httpserver
-index.html
-test.js
 .vscode
 node_modules/
 dist/
-*.sublime-project
+
-*.sublime-workspace
 package-lock.json
 
 

.npmignore

@@ -0,0 +1 @@
+test/

Readme.md

@@ -1,12 +1,30 @@
-## 9号UI组件库的核心
+## Wkit
+> 一个简单易用、功能完善的用于开发`web components`的轻量级开发库。模板解析基于`lit-html`二次开发
+
+![downloads](https://img.shields.io/npm/dt/wkit.svg)
+![version](https://img.shields.io/npm/v/wkit.svg)
 
 ### 开发文档
-[开发文档](https://github.com/bd-js/core/wiki)
+[开发文档](https://git.wkit.fun/bytedo/wkit/wiki)
+
+
+### 我们的特色
+
+- `@xxx=yyy` 事件绑定, 可以任意节点上直接使用类似`vue事件绑定`的这种写法, 就可实现事件绑定。组件被移出文档时, 事件会**自动销毁**, 无须手动销毁。
+- `@click.stop=xxx` 事件绑定支持修饰符
+- `:xxx=yyy`, 属性绑定, 类似`vue`,在属性前加上`:`, 该属性不再使用`setAttribute()`, 而是直接赋值, 可满足你需要传递复杂数据结构的需求。
+- `#animation={type}`, 开箱即用的动画配置, 内置6种动画`fade(默认), scale, bounce, micro-bounce, rotate, slide`
+- `ref=xxx`, 类似`vue`的节点标识, 可方便的在`mounted()`之后通过 `this.$refs.xxx` 来访问该节点
+- 内置特色的双向绑定方法`live()`
+- 用内置的`bind()`方法来给当前组件绑定事件时, 组件移除时事件也会自动销毁,无需手动销毁。
+- 灵活的`props`定义
+
 
 ### 示例
 
 ```js
-import { css, html, Component } from '//jscdn.ink/@bd/core/latest/index.js'
+// alias wkit='//jscdn.ink/wkit/latest/index.js'
+import { css, html, Component } from 'wkit'
 
 class Hello extends Component {
 
@@ -20,7 +38,7 @@ class Hello extends Component {
     bar: String // 简写
   }
 
-  // 若需要支持 scss, 则需要使用 @bd/wcui-cli,预处理。
+  // 若需要支持 scss语法, 则需要使用构建工具编译。
   // 可支持数组
   static styles = css`
     button { color: #09f; }
@@ -48,7 +66,12 @@ class Hello extends Component {
 
 }
 
+if (!customElements.get('wc-hello')) {
   customElements.define('wc-hello', Hello)
+}
+// 和上面的写法等价
+// 如果不希望修改前缀`wc-`的话, 可以直接调用内置的reg方法注册组件即可。
+Hello.reg('hello')
 
 
 /* 
@@ -62,3 +85,7 @@ customElements.define('wc-hello', Hello)
 
 
 
+### 开源协议
+
+- BSD 3-Clause License (Lit框架的html模板解析的源码)
+- MIT (除Lit代码之外的所有代码)

package.json

@@ -1,26 +1,29 @@
 {
-  "name": "@bd/core",
+  "name": "wkit",
-  "version": "1.3.0",
+  "version": "1.12.0",
   "type": "module",
-  "description": "百搭UI组件库的核心",
+  "description": "A library for building fast, lightweight web components.",
   "main": "dist/index.js",
   "files": [
     "dist/*"
   ],
   "scripts": {
-    "build": "esbuild src/index.js --minify --bundle --format=esm --target=esnext --outfile=dist/index.js",
+    "build:next": "esbuild src/index.js --minify --bundle --format=esm --target=esnext --outfile=dist/index.js",
-    "build:es6": "esbuild src/index.js --minify --bundle --format=esm --target=es6 --outfile=dist/index.es6.js"
+    "build:es6": "esbuild src/index.js --minify --bundle --format=esm --target=es6 --outfile=dist/index.es6.js",
+    "build": "npm run build:next && npm run build:es6"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/bd-js/core.git"
+    "url": "https://git.wkit.fun/bytedo/wkit.git"
   },
   "keywords": [
-    "bd.js",
+    "wkit",
-    "bdjs",
-    "bd-ui",
     "wcui",
-    "bd-core"
+    "web-components",
+    "native",
+    "cross-framework",
+    "html",
+    "css"
   ],
   "devDependencies": {
     "esbuild": "^0.17.11"

src/anim.js

@@ -0,0 +1,48 @@
+/**
+ * {}
+ * @author yutent<yutent.io@gmail.com>
+ * @date 2023/03/29 10:28:16
+ */
+
+export function animate(duration = 200, fromto = [], out = false) {
+  if (out === false && this.style.display === 'none') {
+    this.style.display = ''
+  }
+  let res = this.animate(fromto, {
+    duration,
+    direction: out ? 'reverse' : 'normal',
+    fill: 'forwards'
+  })
+  return new Promise(resolve => {
+    res.addEventListener(
+      'finish',
+      _ => {
+        if (out) {
+          this.style.display = 'none'
+        }
+        res.cancel()
+        resolve()
+      },
+      { once: true }
+    )
+  })
+}
+export const MODES = {
+  fade: [{ opacity: 0 }, { opacity: 1 }],
+  scale: [{ transform: 'scale(0)' }, { transform: 'scale(1)' }],
+  'micro-bounce': [
+    { opacity: 0, transform: 'scale(0.8)' },
+    { transform: 'scale(1.05)', opacity: 1 },
+    { transform: 'scale(1)' }
+  ],
+  slide: [
+    { opacity: 0, transform: 'translateY(-50px)' },
+    { opacity: 1, transform: 'translateY(0)' }
+  ],
+  bounce: [
+    { transform: 'scale(0)' },
+    { transform: 'scale(1.2)' },
+    { transform: 'scale(1)' }
+  ],
+  rotate: [{ transform: 'rotate(0)' }, { transform: 'rotate(360deg)' }]
+}

src/constants.js

@@ -27,31 +27,25 @@ const boolMap = Object.create(null)
   'noShade',
   'open',
   'readOnly',
-  'selected'
+  'selected',
+  'loading'
 ].forEach(function (name) {
   boolMap[name.toLowerCase()] = name
 })
 
 export { boolMap }
 
+export const KEEP_ALIVE = 'keep-alive' // hyphen
+export const KEEP_ALIVE_C = 'keepAlive' // camelize
 export const WC_PART = Symbol('wc_path')
-export const NO_CHANGE = Symbol('wc-noChange')
 export const NOTHING = Symbol('wc-nothing')
 export const __finalized__ = Symbol('finalized')
-export const __render__ = Symbol('render')
-export const __init__ = Symbol('init')
 export const __props__ = Symbol('props')
 export const __changed_props__ = Symbol('changed_props')
 export const __mounted__ = Symbol('mounted')
-export const __feedback__ = Symbol('feedback')
 export const __pending__ = Symbol('pending')
-export const __prop2attr__ = Symbol('prop2attr')
-export const __attr2prop__ = Symbol('attr2prop')
-export const __clear_update__ = Symbol('clearupdate')
-export const __children__ = Symbol('children')
-export const __updated__ = Symbol('updated')
 
-export const RESET_CSS_STYLE = `* {box-sizing: border-box;margin: 0;padding: 0;}::before,::after {box-sizing: border-box;}`
+export const RESET_CSS_STYLE = `* {box-sizing: border-box;margin: 0;padding: 0;}::before,::after {box-sizing: border-box;}::selection {background: var(--selection-background, var(--color-plain-a));color: var(--selection-color, inherit);}`
 
 function getDefaultValue(type) {
   switch (type) {
@@ -85,8 +79,26 @@ function getType(v) {
         ? { type: Array, default: v }
         : { type: Object, default: v }
 
+    case 'string':
+      let type = String
+      let attribute = true
+      if (v.includes('!')) {
+        if (v.startsWith('str!')) {
+          v = v.slice(4)
+        } else if (v.startsWith('num!')) {
+          type = Number
+          v = +v.slice(4) || 0
+        } else if (v.startsWith('bool!')) {
+          type = Boolean
+          v = v.slice(5)
+          v = v !== 'false' && v !== ''
+        }
+        attribute = false
+      }
+      return { type, default: v, attribute }
+
     default:
-      return { type: String, default: v + '' }
+      return { type: null, default: '' }
   }
 }
 
@@ -116,6 +128,10 @@ export function parsePropsDeclaration(options) {
       options = { type: Array }
       break
 
+    case String:
+      options = { type: String }
+      break
+
     default:
       options = getType(options)
       break
@@ -123,7 +139,9 @@ export function parsePropsDeclaration(options) {
   options.default = options.hasOwnProperty('default')
     ? options.default
     : getDefaultValue(options.type)
-  options.attribute = true
+  options.attribute = options.hasOwnProperty('attribute')
+    ? options.attribute
+    : true
   return options
 }
 
@@ -131,11 +149,9 @@ export function fixedValue(value, options) {
   switch (options.type) {
     case Number:
       return value === null ? null : +value || 0
-      break
 
     case Boolean:
       return value === false ? false : value !== null
-      break
 
     case Object:
       if (typeof value === 'object') {
@@ -147,7 +163,6 @@ export function fixedValue(value, options) {
           return {}
         }
       }
-      break
 
     case Array:
       if (typeof value === 'object') {
@@ -159,10 +174,11 @@ export function fixedValue(value, options) {
           return []
         }
       }
-      break
+
+    case null:
+      return value
 
     default:
-      return value === null ? null : value + ''
+      return value === null || value === void 0 ? null : value + ''
-      break
   }
 }

src/css.js

@@ -37,7 +37,7 @@ export function adoptStyles(root, styles = '') {
   styles = (RESET_CSS_STYLE + styles.join(' ')).trim()
   sheet.replaceSync(styles)
   if (root.adoptedStyleSheets) {
-    root.adoptedStyleSheets.push(sheet)
+    root.adoptedStyleSheets = [sheet]
   } else {
     root.appendChild(sheet.elem)
   }

src/index.js

@@ -1,5 +1,5 @@
 /**
- * {wcui的核心库, 基于lit-core二次开发}
+ * { wkit library }
  * @author yutent<yutent.io@gmail.com>
  * @date 2023/03/07 18:10:43
  */
@@ -7,25 +7,93 @@ import {
   fixedValue,
   parsePropsDeclaration,
   boolMap,
+  KEEP_ALIVE,
+  KEEP_ALIVE_C,
   __finalized__,
-  __render__,
-  __init__,
   __props__,
   __changed_props__,
   __mounted__,
-  __feedback__,
+  __pending__
-  __pending__,
-  __prop2attr__,
-  __attr2prop__,
-  __clear_update__,
-  __children__,
-  __updated__
 } from './constants.js'
 import { css, adoptStyles } from './css.js'
-import { render, html, svg } from './html.js'
+import { render, html, svg, raw } from './html.js'
-import { nextTick, fire, bind, unbind } from './utils.js'
+import { animate, MODES } from './anim.js'
-export { $, $$, offset, outsideClick, clearOutsideClick } from './utils.js'
+import { nextTick, fire, bind, unbind, hyphen, camelize } from './utils.js'
-export { html, css, svg, bind, unbind, nextTick }
+
+export {
+  $,
+  $$,
+  range,
+  offset,
+  outsideClick,
+  clearOutsideClick
+} from './utils.js'
+export { html, raw, css, svg, bind, unbind, nextTick, fire, hyphen, camelize }
+
+function safely(callback, ...args) {
+  try {
+    callback && callback.apply(this, args)
+  } catch (err) {
+    console.error(err)
+  }
+}
+
+// 简单的类名解析
+export function classMap(data = {}) {
+  let output = ''
+  for (let k in data) {
+    if (data[k]) {
+      output += ' ' + k
+    }
+  }
+  return output.slice(1)
+}
+// 简单的样式解析
+export function styleMap(data = {}) {
+  let output = ''
+  for (let k in data) {
+    if (data[k] || data[k] === 0) {
+      output += hyphen(k) + ':' + data[k] + ';'
+    }
+  }
+  return output
+}
+
+// 三元运算符的函数封装(只为了省个参数)
+export function when(condition, trueCase = '', falseCase = '') {
+  return condition ? trueCase : falseCase
+}
+
+// swicth语句的封装
+export function which(target, list = [], defaultCase = '') {
+  for (let [name, content] of list) {
+    if (target === name) {
+      return content
+    }
+  }
+  return defaultCase
+}
+
+/**
+ * 双向绑定
+ * @param key<String> 绑定的字段
+ * @param el 当前对象, 无需传递, 由框架内部处理
+ *
+ */
+export function live(key, el) {
+  let callback = ev => {
+    Function('o', 'v', `o.${key} = v`)(this, ev.target.value)
+    this.$requestUpdate()
+  }
+
+  if (el && !el.__live__) {
+    bind(el, 'input', callback)
+    this.$events.input ??= []
+    this.$events.input.push({ el, listener: callback, options: false })
+    el.__live__ = true
+  }
+  return Function('o', `return o.${key}`)(this)
+}
 
 export class Component extends HTMLElement {
   /**
@@ -36,36 +104,36 @@ export class Component extends HTMLElement {
     let list = []
 
     this.finalize()
+    this.parseAnim()
 
     this[__props__].forEach((options, prop) => {
-      options.attribute && list.push(prop.toLowerCase())
+      list.push(options.attrName)
     })
-    return list
+    return list.concat(this.watches || [], KEEP_ALIVE)
   }
 
-  static createProperty(name, options) {
+  static parseAnim() {
-    let key = Symbol(name)
+    if (this.hasOwnProperty('animation')) {
-    let descriptor = {
+      let {
-      get() {
+        type = 'fade',
-        return this[key]
+        duration,
-      },
+        custom,
-      set(value) {
+        immediate = false
-        let oldValue = this[key]
+      } = this.animation
-        value = fixedValue(value, options)
+      let fromto = MODES[type] || MODES.fade
-        if (oldValue === value) {
+      if (custom) {
-          return
+        fromto = custom
       }
-        this[key] = value
+      Object.defineProperty(this.prototype, '$animate', {
-        if (options.observer) {
+        value(out) {
-          options.observer.call(this, value, oldValue)
+          if (this[__mounted__]) {
+            return animate.call(this, duration, fromto, out)
           }
-        this.#requestUpdate(name, oldValue)
-      },
-      enumerable: false
         }
-
+      })
-    this[__props__].set(name, options)
+      this.prototype.$animate.immediate = immediate
-    Object.defineProperty(this.prototype, name, descriptor)
+      delete this.animation
+    }
   }
 
   // 处理静态声明
@@ -79,38 +147,135 @@ export class Component extends HTMLElement {
 
     if (this.hasOwnProperty('props')) {
       for (let k in this.props) {
-        let options = parsePropsDeclaration(this.props[k])
+        // 保留关键字, 直接跳过
-        if (boolMap[k] && k !== boolMap[k]) {
+        if (k === KEEP_ALIVE || k === KEEP_ALIVE_C) {
-          k = boolMap[k]
+          continue
         }
-        this.createProperty(k, options)
+        let options = parsePropsDeclaration(this.props[k])
+        let attrName = k.toLowerCase()
+
+        options.attrName = attrName
+
+        if (boolMap[attrName]) {
+          k = boolMap[attrName]
+        } else {
+          options.attrName = hyphen(k)
+          k = camelize(k)
+        }
+        this[__props__].set(k, options)
       }
     }
 
     delete this.props
   }
 
+  static reg(name = '') {
+    name = 'wc-' + name
+    if (!customElements.get(name)) {
+      customElements.define(name, this)
+    }
+  }
+
+  keepAlive = false
+
+  removed = false
+
   constructor() {
     super()
     this[__pending__] = false
     this[__mounted__] = false
-    this[__init__]()
+    // 这里提前定义一次, 是为了在connectedCallback之前, 就已有赋值时报错的bug
-    this.created()
+    this[__changed_props__] = new Map() // 记录一次渲染周期内变化的属性
-  }
+    this.host = this
-
-  [__init__]() {
     this.root = this.shadowRoot || this.attachShadow({ mode: 'open' })
+    this.root.ownHost = this
 
-    this[__changed_props__] = new Map() // 记录本次变化的属性
+    Object.defineProperty(this, '$refs', {
-    // 初始化 props
+      value: Object.create(null)
-    this.constructor[__props__].forEach((options, prop) => {
-      this[prop] = options.default
     })
-    // 若无定义props时, 手动执行一次渲染
+    Object.defineProperty(this, '$events', {
-    if (this[__pending__] === false) {
+      value: Object.create(null)
-      this[__pending__] = true
+    })
-      nextTick(_ => this[__updated__]())
+
+    for (let [prop, options] of this.constructor[__props__]) {
+      this.#createProperty(prop, options)
+      // 按W3C规范, 在构造函数内不可设置节点的属性
+      // 所以这里只记录需要初始化的属性, 在#init()回调中才去修改
+      this[__changed_props__].set(prop, this[prop])
     }
+
+    nextTick(_ => this.created())
+  }
+
+  #createProperty(name, options) {
+    let key = Symbol(name)
+    let descriptor
+
+    if (options.type === Array || options.type === Object) {
+      let proxyValue = this.#createProxy(null, options, name)
+      descriptor = {
+        get() {
+          return proxyValue
+        },
+        set(value) {
+          proxyValue = this.#createProxy(
+            fixedValue(value, options),
+            options,
+            name
+          )
+          this.$requestUpdate(name)
+        }
+      }
+    } else {
+      descriptor = {
+        get() {
+          return this[key]
+        },
+        set(value) {
+          let oldValue = this[key]
+          value = fixedValue(value, options)
+          if (oldValue === value) {
+            return
+          }
+          this[key] = value
+          this.$requestUpdate(name)
+          safely.call(this, options.observer, value, oldValue)
+        }
+      }
+      this[key] = options.default
+    }
+
+    Object.defineProperty(this, name, descriptor)
+  }
+
+  #createProxy(obj, options = {}, key) {
+    return new Proxy(obj || options.default, {
+      get: (target, prop, receiver) => {
+        let value = Reflect.get(target, prop, receiver)
+        // 当访问的值是对象时，需要对这个对象也进行代理
+        if (typeof value === 'object') {
+          return this.#createProxy(value, {}, key)
+        }
+        return value
+      },
+      set: (target, prop, value, receiver) => {
+        let oldValue = target[prop]
+        Reflect.set(target, prop, value, receiver)
+
+        this.$requestUpdate(key)
+        safely.call(this, options.observer, value, oldValue)
+        return true
+      }
+    })
+  }
+
+  #init() {
+    for (let [prop, value] of this[__changed_props__]) {
+      this.#prop2attr(prop, value)
+    }
+    // 这里要清除初始化产生的记录
+    this[__changed_props__].clear()
+    this.$requestUpdate()
   }
 
   #getPropOptions(name) {
@@ -118,21 +283,42 @@ export class Component extends HTMLElement {
   }
 
   connectedCallback() {
+    if (this.$animate) {
+      this.style.display = 'none'
+    }
+    this.removed = false
+    this.#init()
     adoptStyles(this.root, this.constructor.styles)
-
-    this[__children__]?.setConnected(true)
   }
 
   disconnectedCallback() {
-    this[__children__]?.setConnected(false)
+    if (this.keepAlive) {
-    this.unmounted()
+      nextTick(_ => this.deactivated())
+    } else {
+      if (!document.body?.contains(this)) {
+        let $events = this.$events
+        if ($events) {
+          for (let name in $events) {
+            for (let it of $events[name]) {
+              unbind(it.el, name, it.listener, it.options)
+            }
+          }
+        }
+        this.removed = true
+      }
+      nextTick(_ => this.unmounted())
+    }
   }
   // 监听属性变化
   attributeChangedCallback(name, old, val) {
     if (old === val) {
       return
     }
-    this[__attr2prop__](name, val)
+    if (name === KEEP_ALIVE) {
+      this.keepAlive = val !== null
+      return
+    }
+    this.#attr2prop(name, val, old)
   }
 
   /**
@@ -141,10 +327,12 @@ export class Component extends HTMLElement {
    * @param name<String>
    * @param value<String|Boolean|Number>
    */
-  [__prop2attr__](name, value) {
+  #prop2attr(name, value) {
-    let options = this.#getPropOptions(name)
+    let options = this.#getPropOptions(name) || {}
+    let attrName = options.attrName
 
-    if (options.attribute === false) {
+    if (options.attribute === false || options.type === null) {
+      this.removeAttribute(attrName)
       return
     }
 
@@ -152,17 +340,17 @@ export class Component extends HTMLElement {
       case Number:
       case String:
         if (value === null) {
-          this.removeAttribute(name)
+          this.removeAttribute(attrName)
         } else {
-          this.setAttribute(name, value)
+          this.setAttribute(attrName, value)
         }
         break
 
       case Boolean:
         if (value === null || value === false) {
-          this.removeAttribute(name)
+          this.removeAttribute(attrName)
         } else {
-          this.setAttribute(name, '')
+          this.setAttribute(attrName, '')
         }
         break
     }
@@ -173,77 +361,112 @@ export class Component extends HTMLElement {
    * @param name<String>
    * @param value<String|Boolean|Number>
    */
-  [__attr2prop__](name, value) {
+  #attr2prop(name, value, old) {
-    let options = this.#getPropOptions(name)
+    let _name = boolMap[name]
+    let options, propName
 
-    this[name] = fixedValue(value, options)
+    if (_name) {
+      name = _name
+    }
+    propName = camelize(name)
+
+    options = this.#getPropOptions(propName)
+
+    if (options) {
+      value = fixedValue(value, options)
+
+      if (options.attribute === false || options.type === null) {
+        if (value === null) {
+          return
+        }
+        if (value === this[propName]) {
+          this.removeAttribute(name)
+          return
+        }
+      }
+    }
+
+    this[propName] = value
   }
 
   // 请求更新
-  #requestUpdate(name, oldValue) {
+  $requestUpdate(name) {
+    if (name !== void 0) {
       this[__changed_props__].set(name, this[name])
-    this[__prop2attr__](name, this[name])
+      this.#prop2attr(name, this[name])
+    }
 
     if (this[__pending__] === false) {
       this[__pending__] = true
-      nextTick(_ => this[__updated__]())
+      nextTick(_ => this.#confirmUpdate())
     }
   }
 
   // 确认更新到视图
-  [__updated__]() {
+  #confirmUpdate() {
-    if (this[__pending__]) {
-      try {
     let props = this[__changed_props__]
-        this[__render__]()
+    this.#render()
-        this[__feedback__](props)
+    this.#feedback(props)
-      } catch (err) {
+    this.#clearUpdate()
-        console.error(err)
-      }
-      this[__clear_update__]()
-    }
   }
 
   // 更新回调反馈
-  [__feedback__](props) {
+  #feedback(props) {
     // 初始化时不触发updated回调
-    if (!this[__mounted__]) {
+    if (this[__mounted__] === false) {
       this[__mounted__] = true
+      if (this.$animate?.immediate) {
+        this.$animate()
+      }
+      nextTick(_ => {
+        if (this.keepAlive) {
+          this.activated()
+        }
         this.mounted()
+        this.$requestUpdate()
+      })
     } else {
-      this.updated(props)
+      nextTick(_ => this.updated(props))
     }
   }
 
-  [__clear_update__]() {
+  #clearUpdate() {
-    this[__changed_props__] = new Map()
+    this[__changed_props__].clear()
     this[__pending__] = false
   }
 
   // 渲染视图
-  [__render__]() {
+  #render() {
-    let htmlText = this.render()
+    try {
-
+      let ast = this.render()
-    this[__children__] = render(htmlText, this.root, {
+      render(ast, this.root, {
-      host: this,
+        host: this
-      isConnected: !this[__mounted__] && this.isConnected
       })
+    } catch (err) {
+      console.error(err)
     }
+  }
+
   // 几个生命周期回调
   created() {}
   mounted() {}
+  activated() {}
+  deactivated() {}
   unmounted() {}
   updated() {}
-
+  render() {
-  $on(type, callback) {
+    return html`<slot></slot>`
-    return bind(this, type, callback)
   }
 
-  $off(type, callback) {
+  $on(type, callback, options) {
-    unbind(this, type, callback)
+    return bind(this, type, callback, options)
   }
 
-  $emit(type, data = {}) {
+  $off(type, callback, options) {
-    return fire(this, type, data)
+    unbind(this, type, callback, options)
+  }
+
+  $emit(type, data = {}, stop = false) {
+    return fire(this, type, data, stop)
   }
 }

src/utils.js

@@ -4,18 +4,18 @@
  * @date 2023/03/07 22:11:30
  */
 
-export function $(selector, container) {
+export function noop() {}
+
+export function $(selector, container, multi) {
+  let fn = multi ? 'querySelectorAll' : 'querySelector'
   if (container) {
-    return container.querySelector(selector)
+    return container[fn](selector)
   }
-  return document.body.querySelector(selector)
+  return document.body[fn](selector)
 }
 
 export function $$(selector, container) {
-  if (container) {
+  return $(selector, container, true)
-    return container.querySelectorsAll(selector)
-  }
-  return document.body.querySelectorsAll(selector)
 }
 
 export const nextTick = (function () {
@@ -24,11 +24,14 @@ export const nextTick = (function () {
   let bool = false
 
   function callback() {
-    let n = queue.length
+    while (queue.length > 0) {
-    for (let i = 0; i < n; i++) {
+      let fn = queue.shift()
-      queue[i]()
+      try {
+        fn()
+      } catch (err) {
+        console.error(err)
+      }
     }
-    queue = queue.slice(n)
   }
 
   new MutationObserver(callback).observe(node, { characterData: true })
@@ -40,6 +43,46 @@ export const nextTick = (function () {
   }
 })()
 
+export function range(...args) {
+  let start = 0,
+    end = 0,
+    step = 1,
+    out = []
+  switch (args.length) {
+    case 1:
+      end = args[0]
+      break
+    case 2:
+    case 3:
+      ;[start, end, step = 1] = args
+      step = Math.abs(step) || 1
+      break
+  }
+
+  if (start > end) {
+    ;[start, end] = [end, start]
+  }
+
+  for (let i = start; i < end; i += step) {
+    out.push(i)
+  }
+  return out
+}
+
+//驼峰转换为连字符线风格
+export function hyphen(target) {
+  return target.replace(/([a-z\d])([A-Z]+)/g, '$1-$2').toLowerCase()
+}
+
+//连字符转换为驼峰风格
+export function camelize(target) {
+  //提前判断，提高效率
+  if (target.indexOf('-') < 0) {
+    return target
+  }
+  return target.replace(/\-([a-z])/g, (m, s) => s.toUpperCase())
+}
+
 //取得距离页面左上角的坐标
 export function offset(node) {
   try {
@@ -65,12 +108,20 @@ export function offset(node) {
 /**
  * 事件绑定
  */
-export function bind(dom, type, selector, fn, phase = true) {
+export function bind(dom, type = '', selector, fn, phase = false) {
   let events = type.split(',')
   let callback
+  let isWc = dom && dom.host === dom
+  let host = isWc ? dom : null
+
+  if (!dom || !type) {
+    return console.error(
+      "Argument Error: function bind's arg 1 must be a document obejct"
+    )
+  }
 
   if (typeof selector === 'function') {
-    phase = fn
+    phase = fn || false
     fn = selector
     selector = null
   } else {
@@ -80,13 +131,25 @@ export function bind(dom, type, selector, fn, phase = true) {
     fn = fn || noop
   }
 
+  if (isWc === false) {
+    let node = dom
+    while (node && node !== document.body && node !== document) {
+      if (node.ownHost) {
+        isWc = true
+        host = node.ownHost
+        break
+      }
+      node = node.parentNode
+    }
+  }
+
   if (selector) {
     callback = function (ev) {
-      let agents = $(selector, ev.currentTarget)
+      let agents = $(selector, dom)
       let elem = ev.target
       if (agents) {
         while (true) {
-          if (elem === ev.currentTarget) {
+          if (elem === dom) {
             break
           }
           if (agents.contains(elem)) {
@@ -103,7 +166,25 @@ export function bind(dom, type, selector, fn, phase = true) {
   }
 
   events.forEach(function (t) {
-    dom.addEventListener(t.trim(), callback, phase)
+    t = t.trim()
+    if (isWc) {
+      host.$events[t] ??= []
+
+      let _list = host.$events[t]
+      if (_list.length) {
+        let idx = _list.findIndex(
+          it =>
+            it.el === dom && it.listener === callback && it.options === phase
+        )
+        if (idx > -1) {
+          let item = _list[idx]
+          _list.splice(idx, 1)
+          dom.removeEventListener(t, item.listener, item.options)
+        }
+      }
+      _list.push({ el: dom, listener: callback, options: phase })
+    }
+    dom.addEventListener(t, callback, phase)
   })
   return callback
 }
@@ -111,7 +192,7 @@ export function bind(dom, type, selector, fn, phase = true) {
 /**
  * 解除事件绑定
  */
-export function unbind(dom, type, fn = noop, phase = false) {
+export function unbind(dom, type = '', fn = noop, phase = false) {
   let events = type.split(',')
   events.forEach(function (t) {
     dom.removeEventListener(t.trim(), fn, phase)
@@ -147,9 +228,14 @@ export function clearOutsideClick(fn = noop) {
   unbind(document, 'mousedown', fn)
 }
 
-export function fire(el, name = 'click', data = {}) {
+/**
-  let ev = document.createEvent('Events')
+ * @param el <DOM> 节点
-  ev.initEvent(name, true, true)
+ * @param name <String> 自定义的事件名
+ * @param data <Object> 要合并进event对象的参数
+ * @param stop <Boolean> 是否禁止事件冒泡
+ */
+export function fire(el, name = 'click', data = {}, stop) {
+  let ev = new Event(name, { bubbles: !stop, cancelable: true })
   Object.assign(ev, data)
   el.dispatchEvent(ev)
 }

test/index.html

@@ -0,0 +1,47 @@
+<!doctype html>
+<html lang="zh-CN">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+  <title>wkit test page</title>
+  <style>
+    body {line-height: 1.5;font-size:14px;background:var(--page-color);color:var(--text-color);}
+    ::-webkit-scrollbar {
+      width: 6px;
+    }
+    ::-webkit-scrollbar-track {
+      border-radius: 10px;
+      background: var(--summary-bg-color);
+    }
+    ::-webkit-scrollbar-thumb {
+      border-radius: 3px;
+      background: var(--border-color-dark);
+    }
+    ::-webkit-scrollbar-thumb:hover {
+      background: var(--summary-color);
+    }
+    @media screen and (max-width: 480px) {
+      ::-webkit-scrollbar {
+        display: none;
+        width: 0;
+      }
+    }
+  </style>
+  <script type="importmap">
+    {
+      "imports":{
+        "es.shim":"//jscdn.ink/es.shim/latest/index.js",
+        "wkit":"//127.0.0.1:9999/src/index.js",
+        "wkitd":"//jscdn.ink/wkitd/1.3.10/index.js",
+        "fetch":"//jscdn.ink/@bytedo/fetch/latest/next.js",
+        "@bd/ui/":"//jscdn.ink/@bd/ui/0.1.16/"
+      }
+    }
+  </script>
+  <script type="module" src="./test.js"></script>
+</head>
+<body>
+  <wc-app></wc-app>
+</body>
+</html>

test/test.js

@@ -0,0 +1,31 @@
+import { html, Component, live } from 'wkit'
+
+class App extends Component {
+  foo = ''
+
+  bar = { a: 333 }
+
+  created() {
+    // live = live.bind(this)
+  }
+
+  reset() {
+    this.foo = ''
+    this.bar.a = '666'
+    this.$requestUpdate()
+  }
+
+  render() {
+    return html`
+      <p>${this.foo}</p>
+      <p>${this.bar.a}</p>
+      <input value=${live.bind(this, 'bar.a')} />
+      <input value=${this.foo} />
+      <input value=${live.bind(this, 'foo')} />
+
+      <button @click=${this.reset}>666</button>
+    `
+  }
+}
+
+App.reg('app')