Merge pull request #35 from Volicon/f/safe-paths-bug

fix for empty values in id-reference paths

Author: Vlad Balin

dist/index.js

@@ -1,6 +1,6 @@
 {
   "name": "type-r",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Reactive serializable data layer for modern JS applications",
   "main": "./dist/index.js",
   "jsnext:main": "./lib/index.js",

dist/index.js.map

@@ -12,7 +12,7 @@ export interface Traversable {
     get( key : string ) : any 
 }
 
-const referenceMask =  /\^|([^.]+)/g;
+const referenceMask =  /\^|(store\.[^.]+)|([^.]+)/g;
 
 // Compile reference to function
 export type ResolveReference = ( root : Traversable ) => any;  
@@ -26,19 +26,27 @@ export class CompiledReference {
         const path = reference
                         .match( referenceMask )
                         .map( key => {
-                            if( key === '^' ) return 'getOwner()';
+                            if( key === '^' || key === 'owner' ) return 'getOwner()';
 
                             if( key[ 0 ] === '~' ) return `getStore().get("${ key.substr( 1 ) }")`;
+
+                            if( key.indexOf( 'store.' ) === 0 ) return `getStore().get("${ key.substr( 6 ) }")`;
 
                             return key;
                         } );
 
         this.tail = splitTail && path.pop();
         this.local = !path.length;
-
-        path.unshift( 'self' );
 
-        this.resolve = <any> new Function( 'self', `return ${ path.join('.') };` );
+        this.resolve = <any> new Function( 'self', `
+            var v = self.${ path.shift() };
+                           
+            ${ path.map( x => `
+                v = v && v.${ x };
+            `).join('')}
+
+            return v;
+        ` );
     }
 }
 

lib/traversable.js

@@ -867,23 +867,24 @@ var ValidationError = (function () {
     return ValidationError;
 }());
 
-var referenceMask = /\^|([^.]+)/g;
+var referenceMask = /\^|(store\.[^.]+)|([^.]+)/g;
 var CompiledReference = (function () {
     function CompiledReference(reference, splitTail) {
         if (splitTail === void 0) { splitTail = false; }
         var path = reference
             .match(referenceMask)
             .map(function (key) {
-            if (key === '^')
+            if (key === '^' || key === 'owner')
                 return 'getOwner()';
             if (key[0] === '~')
                 return "getStore().get(\"" + key.substr(1) + "\")";
+            if (key.indexOf('store.') === 0)
+                return "getStore().get(\"" + key.substr(6) + "\")";
             return key;
         });
         this.tail = splitTail && path.pop();
         this.local = !path.length;
-        path.unshift('self');
-        this.resolve = new Function('self', "return " + path.join('.') + ";");
+        this.resolve = new Function('self', "\n            var v = self." + path.shift() + ";\n                           \n            " + path.map(function (x) { return "\n                v = v && v." + x + ";\n            "; }).join('') + "\n\n            return v;\n        ");
     }
     return CompiledReference;
 }());