fix

pack.config.js

@@ -1,19 +1,18 @@
 /**
  *
- * @authors yutent (yutent@doui.cc)
+ * @authors yutent (yutent.io@gmail.com)
  * @date    2018-08-04 01:00:06
  */
 
-'use strict'
-
 require('es.shim')
 const fs = require('iofs')
 const path = require('path')
 const chokidar = require('chokidar')
-const uglify = require('uglify-es')
+const { minify } = require('terser')
 const chalk = require('chalk')
+const config = require('./package.json')
 const log = console.log
-const VERSION = '2.0.0'
+const VERSION = config.version
 
 const PACK_DIR = path.resolve('./dist')
 const SOURCE_DIR = path.resolve('./src/')
@@ -59,9 +58,9 @@ export default _Anot
 function comment({ touch } = {}) {
   return `/*==================================================
  * Anot ${touch ? 'touch' : 'normal'} version for future browsers
- * @authors yutent (yutent@doui.cc)
+ * @authors yutent<yutent.io@gmail.com>
- * @date    2017-03-21 21:05:57
+ * @date    ${new Date().format()}
- * V${VERSION}
+ * @version v${VERSION}
  * 
  ==================================================*/
  `
@@ -115,8 +114,8 @@ function packNoCompress(file) {
    * 打包带触摸事件的未来版的 anot
    * --------------------------------------------------------
    */
-  fs.echo(Buffer.concat([PAD_START, touchVer, PAD_END]), './dist/anot-touch.js')
+  fs.echo(Buffer.concat([PAD_START, touchVer, PAD_END]), './dist/anot.touch.js')
-  log('%s 打包完成...', chalk.green('anot-touch.js'))
+  log('%s 打包完成...', chalk.green('anot.touch.js'))
 }
 
 // 打包并压缩
@@ -136,22 +135,24 @@ function packAndCompress() {
    */
   log('正在打包 anot.js...')
   let normalVerPack = Buffer.concat([PAD_START, normalVer, PAD_END]).toString()
-  fs.echo(comment() + uglify.minify(normalVerPack).code, './dist/anot.js')
+
-  log(chalk.green('anot.js 打包压缩完成!'))
+  minify(normalVerPack, { sourceMap: false }).then(res => {
+    fs.echo(comment() + res.code, './dist/anot.js')
+    log(chalk.green('anot.js 打包压缩完成!'))
+  })
 
   /**
    * --------------------------------------------------------
    * 打包带触摸事件的未来版的 anot
    * --------------------------------------------------------
    */
-  log('正在打包 anot-touch.js...')
+  log('正在打包 anot.touch.js...')
   let touchVerPack = Buffer.concat([PAD_START, touchVer, PAD_END]).toString()
 
-  fs.echo(
+  minify(touchVerPack, { sourceMap: false }).then(res => {
-    comment({ touch: true }) + uglify.minify(touchVerPack).code,
+    fs.echo(comment({ touch: true }) + res.code, './dist/anot.touch.js')
-    './dist/anot-touch.js'
+    log(chalk.green('anot.touch.js 打包压缩完成!'))
-  )
+  })
-  log(chalk.green('anot-touch.js 打包压缩完成!'))
 }
 
 let args = process.argv.slice(2)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "anot",
-  "version": "2.1.1",
+  "version": "2.2.4",
   "description": "Anot - 迷你mvvm框架",
   "main": "dist/anot.js",
   "files": ["dist"],
@@ -14,9 +14,9 @@
   "devDependencies": {
     "chalk": "^2.4.1",
     "chokidar": "^2.0.4",
-    "es.shim": "^1.1.2",
+    "es.shim": "^2.0.1",
-    "iofs": "^1.1.0",
+    "iofs": "^1.5.2",
-    "uglify-es": "^3.3.9"
+    "terser": "^5.0.0"
   },
   "repository": "https://github.com/yutent/anot.js.git",
   "author": "yutent",

readme.md

@@ -16,7 +16,7 @@ npm run prod
 ```
 执行完, 会打包为2个版本, 分别是
 - anot.js  普通版(需要支持es6 module的现代浏览器)
-- anot-touch.js  带触摸的版本(需要支持es6 module的现代浏览器)
+- anot.touch.js  带触摸事件的版本(需要支持es6 module的现代浏览器)
 
 
 ### 文档:

src/00-generate.js

@@ -31,6 +31,8 @@ function createMap() {
   return Object.create(null)
 }
 
+var encode = encodeURIComponent
+var decode = decodeURIComponent
 var subscribers = '$' + expose
 
 var nullObject = {} //作用类似于noop，只用于代码防御，千万不要在它上面添加属性

src/02-core.js

@@ -4,14 +4,7 @@ let Anot = function(el) {
 }
 
 /*视浏览器情况采用最快的异步回调*/
-Anot.nextTick = new (function() {
+Anot.nextTick = (function() {
-  // jshint ignore:line
-  let tickImmediate = window.setImmediate
-  let tickObserver = window.MutationObserver
-  if (tickImmediate) {
-    return tickImmediate.bind(window)
-  }
-
   let queue = []
   function callback() {
     let n = queue.length
@@ -21,21 +14,16 @@ Anot.nextTick = new (function() {
     queue = queue.slice(n)
   }
 
-  if (tickObserver) {
+  let node = document.createTextNode('<!-- -->')
-    let node = document.createTextNode('anot')
+  new MutationObserver(callback).observe(node, { characterData: true })
-    new tickObserver(callback).observe(node, { characterData: true }) // jshint ignore:line
-    let bool = false
-    return function(fn) {
-      queue.push(fn)
-      bool = !bool
-      node.data = bool
-    }
-  }
 
+  let bool = false
   return function(fn) {
-    setTimeout(fn, 4)
+    queue.push(fn)
+    bool = !bool
+    node.data = bool
   }
-})() // jshint ignore:line
+})()
 
 /*********************************************************************
  *                 Anot的静态方法定义区                              *
@@ -97,10 +85,7 @@ Anot.PropsTypes.isBoolean = function() {
 /*判定是否是一个朴素的javascript对象（Object），不是DOM对象，不是BOM对象，不是自定义类的实例*/
 Anot.isPlainObject = function(obj) {
   // 简单的 typeof obj === "object"检测，会致使用isPlainObject(window)在opera下通不过
-  return (
+  return serialize.call(obj) === '[object Object]' && Object.getPrototypeOf(obj) === oproto
-    serialize.call(obj) === '[object Object]' &&
-    Object.getPrototypeOf(obj) === oproto
-  )
 }
 
 let VMODELS = (Anot.vmodels = {}) //所有vmodel都储存在这里
@@ -180,11 +165,7 @@ Anot.mix = Anot.fn.mix = function() {
         if (target === copy) {
           continue
         }
-        if (
+        if (deep && copy && (Anot.isPlainObject(copy) || (copyIsArray = Array.isArray(copy)))) {
-          deep &&
-          copy &&
-          (Anot.isPlainObject(copy) || (copyIsArray = Array.isArray(copy)))
-        ) {
           if (copyIsArray) {
             copyIsArray = false
             clone = src && Array.isArray(src) ? src : []
@@ -290,11 +271,11 @@ Anot.mix({
       t = t.trim()
       let hook = hooks[t]
       if (typeof hook === 'object') {
-        t = hook.type || type
+        t = hook.type || t
-        phase = hook.phase || !!phase
+        phase = hook.phase || phase
         fn = hook.fix ? hook.fix(el, fn) : fn
       }
-      el.addEventListener(t, fn, phase)
+      el.addEventListener(t, fn, !!phase)
     })
     return fn
   },
@@ -307,10 +288,10 @@ Anot.mix({
       t = t.trim()
       let hook = hooks[t]
       if (typeof hook === 'object') {
-        t = hook.type || type
+        t = hook.type || t
-        phase = hook.phase || !!phase
+        phase = hook.phase || phase
       }
-      el.removeEventListener(t, fn, phase)
+      el.removeEventListener(t, fn, !!phase)
     })
   },
   /*读写删除元素节点的样式*/
@@ -423,7 +404,7 @@ Anot.mix({
 
       if ((this.type(val) == 'string' && val.trim() === '') || val === null) {
         document.cookie =
-          encodeURIComponent(key) +
+          encode(key) +
           '=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=' +
           opt.domain +
           '; path=' +
@@ -447,9 +428,9 @@ Anot.mix({
         }
       }
       document.cookie =
-        encodeURIComponent(key) +
+        encode(key) +
         '=' +
-        encodeURIComponent(val) +
+        encode(val) +
         opt.expires +
         '; domain=' +
         opt.domain +
@@ -463,11 +444,11 @@ Anot.mix({
         return document.cookie
       }
       return (
-        decodeURIComponent(
+        decode(
           document.cookie.replace(
             new RegExp(
               '(?:(?:^|.*;)\\s*' +
-                encodeURIComponent(key).replace(/[\-\.\+\*]/g, '\\$&') +
+                encode(key).replace(/[\-\.\+\*]/g, '\\$&') +
                 '\\s*\\=\\s*([^;]*).*$)|^.*$'
             ),
             '$1'
@@ -478,13 +459,12 @@ Anot.mix({
   },
   //获取url的参数
   search: function(key) {
-    key += ''
     let uri = location.search
 
-    if (!key || !uri) {
+    if (!uri) {
       return null
     }
-    uri = decodeURIComponent(uri)
+    uri = decode(uri)
 
     uri = uri.slice(1)
     uri = uri.split('&')
@@ -505,26 +485,19 @@ Anot.mix({
         obj[tmp[0]] = tmp[1]
       }
     }
-    return obj.hasOwnProperty(key) ? obj[key] : null
+    if (key) {
+      return obj.hasOwnProperty(key) ? obj[key] : null
+    } else {
+      return obj
+    }
   },
   //复制文本到粘贴板
   copy: function(txt) {
-    if (!DOC.queryCommandSupported || !DOC.queryCommandSupported('copy')) {
-      return log('该浏览器不支持复制到粘贴板')
-    }
-
-    let ta = DOC.createElement('textarea')
-    ta.textContent = txt
-    ta.style.position = 'fixed'
-    ta.style.bottom = '-1000px'
-    DOC.body.appendChild(ta)
-    ta.select()
     try {
-      DOC.execCommand('copy')
+      navigator.clipboard.writeText(txt)
     } catch (err) {
       log('复制到粘贴板失败', err)
     }
-    DOC.body.removeChild(ta)
   }
 })
 

src/06-vm.js

@@ -264,8 +264,8 @@ function observeObject(source, options) {
             return (old = value.get.call(this))
           },
           set: function(x) {
-            var older = old,
+            var older = old
-              newer
+            var newer
             value.set.call(this, x)
             newer = this[key]
             if (this.$fire && newer !== older) {

src/13-scan.js

@@ -50,7 +50,7 @@ function executeBindings(bindings, vmodels) {
 }
 
 var roneTime = /^\s*::/
-var rmsAttr = /:(\w+)-?(.*)|@(.*)/
+var rmsAttr = /^:(\w+)-?(.*)|@(.*)/
 
 var events = oneObject(
   'animationend,blur,change,input,click,dblclick,focus,keydown,keypress,keyup,mousedown,mouseenter,mouseleave,mousemove,mouseout,mouseover,mouseup,scan,scroll,submit'
@@ -372,6 +372,8 @@ function scanText(textNode, vmodels, index) {
       anotFragment.appendChild(node)
     }
     textNode.parentNode.replaceChild(anotFragment, textNode)
-    if (bindings.length) executeBindings(bindings, vmodels)
+    if (bindings.length) {
+      executeBindings(bindings, vmodels)
+    }
   }
 }

src/16-:attr.js

@@ -47,7 +47,8 @@ var attrDir = Anot.directive('attr', {
   },
   update: function(val) {
     var elem = this.element
-    var obj = {}
+    var obj = Object.create(null)
+    var isSVG = rsvg.test(elem)
 
     val = toJson(val)
 
@@ -83,44 +84,47 @@ var attrDir = Anot.directive('attr', {
         elem.style.cssText = obj[i]
         continue
       }
-      if (i === 'href' || i === 'src') {
+
+      if (i.slice(0, 6) === 'xlink:') {
+        var k = i
+        i = i.slice(6)
+        obj[i] = obj[k]
+        delete obj[k]
+      }
+      // 修正这些值的显示
+      if (obj[i] === false || obj[i] === null || obj[i] === undefined) {
+        obj[i] = ''
+      }
+
+      if (
+        typeof elem[i] === 'boolean' ||
+        typeof elem[boolMap[i]] === 'boolean'
+      ) {
+        var k = i
+        if (boolMap[i] && k !== boolMap[i]) {
+          k = boolMap[i]
+        }
+        //布尔属性必须使用el.xxx = true|false方式设值
+        obj[i] = !!obj[i]
+        elem[k] = obj[i]
+
+        if (!obj[i]) {
+          elem.removeAttribute(k)
+          continue
+        }
+      }
+
+      //SVG只能使用setAttribute(xxx, yyy), HTML的固有属性必须elem.xxx = yyy
+      var isInnate = isSVG ? false : i in elem.cloneNode(false)
+      if (isInnate) {
         elem[i] = obj[i]
       } else {
-        // 修正这些值的显示
+        if (typeof obj[i] === 'object') {
-        if (obj[i] === false || obj[i] === null || obj[i] === undefined) {
+          obj[i] = Date.isDate(obj[i])
-          obj[i] = ''
+            ? obj[i].toISOString()
-        }
+            : JSON.stringify(obj[i])
-
-        if (
-          typeof elem[i] === 'boolean' ||
-          typeof elem[boolMap[i]] === 'boolean'
-        ) {
-          var k = i
-          if (boolMap[i] && k !== boolMap[i]) {
-            k = boolMap[i]
-          }
-          //布尔属性必须使用el.xxx = true|false方式设值
-          obj[i] = !!obj[i]
-          elem[k] = obj[i]
-
-          if (!obj[i]) {
-            elem.removeAttribute(k)
-            continue
-          }
-        }
-
-        //SVG只能使用setAttribute(xxx, yyy), HTML的固有属性必须elem.xxx = yyy
-        var isInnate = rsvg.test(elem) ? false : i in elem.cloneNode(false)
-        if (isInnate) {
-          elem[i] = obj[i]
-        } else {
-          if (typeof obj[i] === 'object') {
-            obj[i] = Date.isDate(obj[i])
-              ? obj[i].toISOString()
-              : JSON.stringify(obj[i])
-          }
-          elem.setAttribute(i, obj[i])
         }
+        elem.setAttribute(i, obj[i])
       }
     }
   }

src/26-:include.js

@@ -20,6 +20,26 @@ function nodesToFrag(nodes) {
   }
   return frag
 }
+
+function _fetch(url) {
+  var xhr = new XMLHttpRequest()
+  var defer = Promise.defer()
+  xhr.open('GET', url, true)
+  xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest')
+  xhr.responseType = 'text'
+  xhr.onreadystatechange = function() {
+    if (this.readyState === 4) {
+      if (this.status >= 200 && this.status < 400) {
+        defer.resolve(this.response)
+      } else {
+        defer.reject(this)
+      }
+    }
+  }
+  xhr.send(null)
+  return defer.promise
+}
+
 Anot.directive('include', {
   init: directives.attr.init,
   update: function(val) {
@@ -141,27 +161,17 @@ Anot.directive('include', {
         scanTemplate(templatePool[val])
       })
     } else {
-      fetch(val, {
+      _fetch(val)
-        method: 'get',
-        headers: {
-          'X-Requested-With': 'XMLHttpRequest'
-        }
-      })
-        .then(res => {
-          if (res.status >= 200 && res.status < 300) {
-            return res.text()
-          } else {
-            return Promise.reject(
-              `获取网络资源出错, ${res.status} (${res.statusText})`
-            )
-          }
-        })
         .then(text => {
           templatePool[val] = text
           scanTemplate(text)
         })
         .catch(err => {
-          log(':include load [' + val + '] error\n%c%s', 'color:#f30', err)
+          log(
+            ':include load [' + val + '] error\n%c%s',
+            'color:#f30',
+            `获取网络资源出错, ${err.status} (${err.statusText})`
+          )
         })
     }
   }