add utils.extend

TODO.md

@@ -1,7 +1,5 @@
-- fix todomvc example.
 - consult https://github.com/RubyLouvre/avalon/issues/11 to allow simple expressions in directives.
 - $watch / $unwatch (now much easier)
-- add a few util methods, e.g. extend, inherits, traverse
 - tests
 - docs
 - sd-with?

src/compiler.js

@@ -22,17 +22,11 @@ function Compiler (vm, options) {
 
     // copy options
     options = options || {}
-    for (var key in options) {
-        this[key] = options[key]
-    }
+    utils.extend(this, options)
 
     // copy data if any
     var data = options.data
-    if (data) {
-        for (key in data) {
-            vm[key] = data[key]
-        }
-    }
+    if (data) utils.extend(vm, data)
 
     // determine el
     var tpl = options.template,
@@ -96,7 +90,7 @@ function Compiler (vm, options) {
     this.compileNode(this.el, true)
 
     // for anything in viewmodel but not binded in DOM, also create bindings for them
-    for (key in vm) {
+    for (var key in vm) {
         if (vm.hasOwnProperty(key) &&
             key.charAt(0) !== '$' &&
             !this.bindings.hasOwnProperty(key))

src/deps-parser.js

@@ -5,7 +5,7 @@ var Emitter  = require('emitter'),
 
 var dummyEl = document.createElement('div'),
     ARGS_RE = /^function\s*?\((.+?)[\),]/,
-    SCOPE_RE_STR = '\\.vm\\.[\\.A-Za-z0-9_][\\.A-Za-z0-9_$]*',
+    SCOPE_RE_STR = '\\.vm\\.[\\.\\w][\\.\\w$]*',
     noop = function () {}
 
 /*

src/directive-parser.js

@@ -8,35 +8,29 @@ var KEY_RE          = /^[^\|<]+/,
     FILTERS_RE      = /\|[^\|<]+/g,
     FILTER_TOKEN_RE = /[^\s']+|'[^']+'/g,
     INVERSE_RE      = /^!/,
-    NESTING_RE      = /^\^+/,
-    ONEWAY_RE       = /-oneway$/
+    NESTING_RE      = /^\^+/
 
 /*
  *  Directive class
  *  represents a single directive instance in the DOM
  */
-function Directive (directiveName, expression, oneway) {
+function Directive (directiveName, expression) {
 
-    var prop,
-        definition = directives[directiveName]
+    var definition = directives[directiveName]
 
     // mix in properties from the directive definition
     if (typeof definition === 'function') {
         this._update = definition
     } else {
-        this._update = definition.update
-        for (prop in definition) {
-            if (prop !== 'update') {
-                if (prop === 'unbind') {
-                    this._unbind = definition[prop]
-                } else {
-                    this[prop] = definition[prop]
-                }
+        for (var prop in definition) {
+            if (prop === 'unbind' || prop === 'update') {
+                this['_' + prop] = definition[prop]
+            } else {
+                this[prop] = definition[prop]
             }
         }
     }
 
-    this.oneway        = !!oneway
     this.directiveName = directiveName
     this.expression    = expression.trim()
     this.rawKey        = expression.match(KEY_RE)[0].trim()
@@ -182,11 +176,6 @@ module.exports = {
         if (dirname.indexOf(prefix) === -1) return null
         dirname = dirname.slice(prefix.length + 1)
 
-        var oneway = ONEWAY_RE.test(dirname)
-        if (oneway) {
-            dirname = dirname.slice(0, -7)
-        }
-
         var dir   = directives[dirname],
             valid = KEY_RE.test(expression)
 
@@ -194,7 +183,7 @@ module.exports = {
         if (!valid) utils.warn('invalid directive expression: ' + expression)
 
         return dir && valid
-            ? new Directive(dirname, expression, oneway)
+            ? new Directive(dirname, expression)
             : null
     }
 }

src/main.js

@@ -40,11 +40,7 @@ api.filter = function (name, fn) {
  *  Set config options
  */
 api.config = function (opts) {
-    if (opts) {
-        for (var key in opts) {
-            config[key] = opts[key]
-        }
-    }
+    if (opts) utils.extend(config, opts)
     textParser.buildRegex()
 }
 
@@ -79,13 +75,9 @@ ViewModel.extend = function (options) {
         }
         ViewModel.call(this, opts)
     }
-    var p = ExtendedVM.prototype = Object.create(ViewModel.prototype)
-    p.constructor = ExtendedVM
-    if (options.props) {
-        for (var prop in options.props) {
-            p[prop] = options.props[prop]
-        }
-    }
+    var proto = ExtendedVM.prototype = Object.create(ViewModel.prototype)
+    proto.constructor = ExtendedVM
+    if (options.props) utils.extend(proto, options.props)
     if (options.id) {
         utils.registerVM(options.id, ExtendedVM)
     }

src/utils.js

@@ -3,16 +3,17 @@ var config        = require('./config'),
     templates     = {},
     VMs           = {}
 
-/*
- *  get accurate type of an object
- */
-function typeOf (obj) {
-    return toString.call(obj).slice(8, -1)
-}
-
 module.exports = {
 
-    typeOf: typeOf,
+    typeOf: function (obj) {
+        return toString.call(obj).slice(8, -1)
+    },
+
+    extend: function (obj, ext) {
+        for (var key in ext) {
+            obj[key] = ext[key]
+        }
+    },
 
     collectTemplates: function () {
         var selector = 'script[type="text/' + config.prefix + '-template"]',