Add ObjectPath as a provider

Author: mike-marcacci

bower.json

@@ -13,7 +13,14 @@
   "moduleType": [
     "globals"
   ],
-  "keywords": ["angular","angularjs","form","json","json-schema","schema"],
+  "keywords": [
+    "angular",
+    "angularjs",
+    "form",
+    "json",
+    "json-schema",
+    "schema"
+  ],
   "license": "MIT",
   "ignore": [
     "**/.*",
@@ -27,7 +34,8 @@
     "tv4": "~1.0.15",
     "pickadate": "~3.5.2",
     "angular-sanitize": "~1.2.18",
-    "bootstrap-vertical-tabs": "~1.1.0"
+    "bootstrap-vertical-tabs": "~1.1.0",
+    "objectpath": "~1.0.2"
   },
   "devDependencies": {
     "angular-ui-ace": "bower"

dist/bootstrap-datepicker.min.js

@@ -1,4 +1,4 @@
-var deps = [];
+var deps = ['ObjectPath'];
 try {
   //This throws an expection if module does not exist.
   angular.module('ngSanitize');
@@ -13,98 +13,6 @@ try {
 
 angular.module('schemaForm',deps);
 
-
-'use strict';
-
-;!function(undefined) {
-
-	var ObjectPath = {
-		parse: function(str){
-			if(typeof str !== 'string'){
-				throw new TypeError('ObjectPath.parse must be passed a string');
-			}
-
-			var i = 0;
-			var parts = [];
-			var d, b, q, c;
-			while (i < str.length){
-				d = str.indexOf('.', i);
-				b = str.indexOf('[', i);
-
-				// we've reached the end
-				if (d === -1 && b === -1){
-					parts.push(str.slice(i, str.length));
-					i = str.length;
-				}
-
-				// dots
-				else if (b === -1 || (d !== -1 && d < b)) {
-					parts.push(str.slice(i, d));
-					i = d + 1;
-				}
-
-				// brackets
-				else {
-					if (b > i){
-						parts.push(str.slice(i, b));
-						i = b;
-					}
-					q = str.slice(b+1, b+2);
-					if (q !== '"' && q !=='\'') {
-						c = str.indexOf(']', b);
-						if (c === -1) c = str.length;
-						parts.push(str.slice(i + 1, c));
-						i = (str.slice(c + 1, c + 2) === '.') ? c + 2 : c + 1;
-					} else {
-						c = str.indexOf(q+']', b);
-						if (c === -1) c = str.length;
-						while (str.slice(c - 1, c) === '\\' && b < str.length){
-							b++;
-							c = str.indexOf(q+']', b);
-						}
-						parts.push(str.slice(i + 2, c).replace(new RegExp('\\'+q,'g'), q));
-						i = (str.slice(c + 2, c + 3) === '.') ? c + 3 : c + 2;
-					}
-				}
-			}
-			return parts;
-		},
-
-		// root === true : auto calculate root; must be dot-notation friendly
-		// root String : the string to use as root
-		stringify: function(arr, quote){
-
-			if(Array.isArray(arr) !== true)
-				arr = [arr.toString()];
-
-			quote = quote === '"' ? '"' : '\'';
-
-			return arr.slice().map(function(n){ return '[' + quote + (n.toString()).replace(new RegExp(quote, 'g'), '\\' + quote) + quote + ']'; }).join('');
-		},
-
-		normalize: function(str){
-			return this.stringify(this.parse(str));
-		}
-	};
-
-	// AMD
-	if (typeof define === 'function' && define.amd) {
-		define(function() {
-			return ObjectPath;
-		});
-	}
-
-	// CommonJS
-	else if (typeof exports === 'object') {
-		exports.ObjectPath = ObjectPath;
-	}
-
-	// Browser global.
-	else {
-		window.ObjectPath = ObjectPath;
-	}
-}();
-
 /**
  * @ngdoc service
  * @name sfSelect
@@ -125,7 +33,7 @@ angular.module('schemaForm',deps);
  * @returns {Any|undefined} returns the value at the end of the projection path
  *                          or undefined if there is none.
  */
-angular.module('schemaForm').factory('sfSelect', [function () {
+angular.module('schemaForm').factory('sfSelect', ['ObjectPath', function (ObjectPath) {
   var numRe = /^\d+$/;
 
   return function(projection, obj, valueToSet) {
@@ -178,7 +86,7 @@ angular.module('schemaForm').factory('sfSelect', [function () {
   };
 }]);
 
-angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider',function($compileProvider){
+angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider','ObjectPathProvider',function($compileProvider, ObjectPathProvider){
   var defaultDecorator = '';
   var directives = {};
 
@@ -231,7 +139,7 @@ angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider'
                 //for fieldsets to recurse properly.
                 var url = templateUrl(name,form);
                 $http.get(url,{ cache: $templateCache }).then(function(res){
-                  var key = form.key ? ObjectPath.stringify(form.key).replace(/"/g, '&quot;') : '';
+                  var key = form.key ? ObjectPathProvider.stringify(form.key).replace(/"/g, '&quot;') : '';
                   var template = res.data.replace(/\$\$value\$\$/g,'model'+key);
                   $compile(template)(scope,function(clone){
                     element.replaceWith(clone);
@@ -484,7 +392,7 @@ angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider'
  * This service is not that useful outside of schema form directive
  * but makes the code more testable.
  */
-angular.module('schemaForm').provider('schemaForm',[function(){
+angular.module('schemaForm').provider('schemaForm',['ObjectPathProvider', function(ObjectPathProvider){
 
   var defaultFormDefinition = function(name,schema,options){
     var rules = defaults[schema.type];
@@ -526,7 +434,7 @@ angular.module('schemaForm').provider('schemaForm',[function(){
       var f = stdFormObj(schema,options);
       f.key  = options.path;
       f.type = 'text';
-      options.lookup[ObjectPath.stringify(options.path)] = f;
+      options.lookup[ObjectPathProvider.stringify(options.path)] = f;
       return f;
     }
   };
@@ -538,7 +446,7 @@ angular.module('schemaForm').provider('schemaForm',[function(){
       var f = stdFormObj(schema,options);
       f.key  = options.path;
       f.type = 'number';
-      options.lookup[ObjectPath.stringify(options.path)] = f;
+      options.lookup[ObjectPathProvider.stringify(options.path)] = f;
       return f;
     }
   };
@@ -548,7 +456,7 @@ angular.module('schemaForm').provider('schemaForm',[function(){
       var f = stdFormObj(schema,options);
       f.key  = options.path;
       f.type = 'number';
-      options.lookup[ObjectPath.stringify(options.path)] = f;
+      options.lookup[ObjectPathProvider.stringify(options.path)] = f;
       return f;
     }
   };
@@ -558,7 +466,7 @@ angular.module('schemaForm').provider('schemaForm',[function(){
       var f = stdFormObj(schema,options);
       f.key  = options.path;
       f.type = 'checkbox';
-      options.lookup[ObjectPath.stringify(options.path)] = f;
+      options.lookup[ObjectPathProvider.stringify(options.path)] = f;
       return f;
     }
   };
@@ -575,7 +483,7 @@ angular.module('schemaForm').provider('schemaForm',[function(){
           f.titleMap[name] = name;
         });
       }
-      options.lookup[ObjectPath.stringify(options.path)] = f;
+      options.lookup[ObjectPathProvider.stringify(options.path)] = f;
       return f;
     }
   };
@@ -591,7 +499,7 @@ angular.module('schemaForm').provider('schemaForm',[function(){
           f.titleMap[name] = name;
         });
       }
-      options.lookup[ObjectPath.stringify(options.path)] = f;
+      options.lookup[ObjectPathProvider.stringify(options.path)] = f;
       return f;
     }
   };
@@ -604,13 +512,13 @@ angular.module('schemaForm').provider('schemaForm',[function(){
       var f   = stdFormObj(schema,options);
       f.type  = 'fieldset';
       f.items = [];
-      options.lookup[ObjectPath.stringify(options.path)] = f;
+      options.lookup[ObjectPathProvider.stringify(options.path)] = f;
 
       //recurse down into properties
       angular.forEach(schema.properties,function(v,k){
         var path = options.path.slice();
         path.push(k);
-        if (options.ignore[ObjectPath.stringify(path)] !== true) {
+        if (options.ignore[ObjectPathProvider.stringify(path)] !== true) {
           var required = schema.required && schema.required.indexOf(k) !== -1;
 
           var def = defaultFormDefinition(k,v,{
@@ -636,7 +544,7 @@ angular.module('schemaForm').provider('schemaForm',[function(){
       var f   = stdFormObj(schema,options);
       f.type  = 'array';
       f.key   = options.path;
-      options.lookup[ObjectPath.stringify(options.path)] = f;
+      options.lookup[ObjectPathProvider.stringify(options.path)] = f;
 
       var required = schema.required && schema.required.indexOf(options.path(options.path.length - 1)) !== -1;
 
@@ -772,9 +680,9 @@ angular.module('schemaForm').provider('schemaForm',[function(){
         //extend with std form from schema.
         if (obj.key) {
           if(typeof obj.key == 'string') {
-            obj.key = ObjectPath.parse(obj.key);
+            obj.key = ObjectPathProvider.parse(obj.key);
           }
-          var str = ObjectPath.stringify(obj.key);
+          var str = ObjectPathProvider.stringify(obj.key);
           if(lookup[str]){
             return angular.extend(lookup[str],obj);
           }

dist/schema-form.min.js

@@ -65,6 +65,7 @@ <h3>Schema</h3>
 <script type="text/javascript" src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
 <script type="text/javascript" src="../bower_components/angular-ui-sortable/sortable.js"></script>
 <script type="text/javascript" src="../bower_components/angular-ui-ace/ui-ace.js"></script>
+<script type="text/javascript" src="../bower_components/objectpath/lib/ObjectPath.js"></script>
 <script type="text/javascript" src="../bower_components/pickadate/lib/picker.js"></script>
 <script type="text/javascript" src="../bower_components/pickadate/lib/picker.date.js"></script>
 <script type="text/javascript" src="../bower_components/pickadate/lib/translations/sv_SE.js"></script>
@@ -73,7 +74,7 @@ <h3>Schema</h3>
 <script type="text/javascript" src="../dist/bootstrap-datepicker.min.js"></script>
 <script type="text/javascript">
 
-angular.module('test',['schemaForm','ui.ace']);
+angular.module('test',['schemaForm','ui.ace','ObjectPath']);
 
 function TestCtrl($scope,$http){
 

examples/bootstrap-example.html

@@ -1,13 +1,13 @@
 angular.module('schemaForm').config(
-       ['schemaFormProvider','schemaFormDecoratorsProvider',
-function(schemaFormProvider,  schemaFormDecoratorsProvider){
+       ['schemaFormProvider','schemaFormDecoratorsProvider','ObjectPathProvider',
+function(schemaFormProvider,  schemaFormDecoratorsProvider, ObjectPathProvider){
 
   var datepicker = function(name,schema,options) {
     if (schema.type === 'string' && schema.format == "date") {
       var f = schemaFormProvider.stdFormObj(schema,options);
       f.key  = options.path;
       f.type = 'datepicker';
-      options.lookup[ObjectPath.stringify(options.path)] = f;
+      options.lookup[ObjectPathProvider.stringify(options.path)] = f;
       return f;
     }
   };

src/directives/decorators/bootstrap/datepicker/bootstrap-datepicker.js

@@ -1,4 +1,4 @@
-var deps = [];
+var deps = ['ObjectPath'];
 try {
   //This throws an expection if module does not exist.
   angular.module('ngSanitize');
@@ -12,95 +12,3 @@ try {
 } catch (e) {}
 
 angular.module('schemaForm',deps);
-
-
-'use strict';
-
-;!function(undefined) {
-
-	var ObjectPath = {
-		parse: function(str){
-			if(typeof str !== 'string'){
-				throw new TypeError('ObjectPath.parse must be passed a string');
-			}
-
-			var i = 0;
-			var parts = [];
-			var d, b, q, c;
-			while (i < str.length){
-				d = str.indexOf('.', i);
-				b = str.indexOf('[', i);
-
-				// we've reached the end
-				if (d === -1 && b === -1){
-					parts.push(str.slice(i, str.length));
-					i = str.length;
-				}
-
-				// dots
-				else if (b === -1 || (d !== -1 && d < b)) {
-					parts.push(str.slice(i, d));
-					i = d + 1;
-				}
-
-				// brackets
-				else {
-					if (b > i){
-						parts.push(str.slice(i, b));
-						i = b;
-					}
-					q = str.slice(b+1, b+2);
-					if (q !== '"' && q !=='\'') {
-						c = str.indexOf(']', b);
-						if (c === -1) c = str.length;
-						parts.push(str.slice(i + 1, c));
-						i = (str.slice(c + 1, c + 2) === '.') ? c + 2 : c + 1;
-					} else {
-						c = str.indexOf(q+']', b);
-						if (c === -1) c = str.length;
-						while (str.slice(c - 1, c) === '\\' && b < str.length){
-							b++;
-							c = str.indexOf(q+']', b);
-						}
-						parts.push(str.slice(i + 2, c).replace(new RegExp('\\'+q,'g'), q));
-						i = (str.slice(c + 2, c + 3) === '.') ? c + 3 : c + 2;
-					}
-				}
-			}
-			return parts;
-		},
-
-		// root === true : auto calculate root; must be dot-notation friendly
-		// root String : the string to use as root
-		stringify: function(arr, quote){
-
-			if(Array.isArray(arr) !== true)
-				arr = [arr.toString()];
-
-			quote = quote === '"' ? '"' : '\'';
-
-			return arr.slice().map(function(n){ return '[' + quote + (n.toString()).replace(new RegExp(quote, 'g'), '\\' + quote) + quote + ']'; }).join('');
-		},
-
-		normalize: function(str){
-			return this.stringify(this.parse(str));
-		}
-	};
-
-	// AMD
-	if (typeof define === 'function' && define.amd) {
-		define(function() {
-			return ObjectPath;
-		});
-	}
-
-	// CommonJS
-	else if (typeof exports === 'object') {
-		exports.ObjectPath = ObjectPath;
-	}
-
-	// Browser global.
-	else {
-		window.ObjectPath = ObjectPath;
-	}
-}();