Add a few extra error messages to help catch typos in schemas.

chrome/renderer/resources/json_schema.js

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // -----------------------------------------------------------------------------
 // NOTE: If you change this file you need to touch renderer_resources.grd to
 // have your change take effect.
 // -----------------------------------------------------------------------------
 
 //==============================================================================
@@ skipping 53 matching lines @@
   arrayMinItems: "Array must have at least * items.",
   arrayMaxItems: "Array must not have more than * items.",
   itemRequired: "Item is required.",
   stringMinLength: "String must be at least * characters long.",
   stringMaxLength: "String must not be more than * characters long.",
   stringPattern: "String must match the pattern: *.",
   numberMinValue: "Value must not be less than *.",
   numberMaxValue: "Value must not be greater than *.",
   numberMaxDecimal: "Value must not have more than * decimal places.",
   invalidType: "Expected '*' but got '*'.",
-  invalidChoice: "Value does not match any valid type choices."
+  invalidChoice: "Value does not match any valid type choices.",
+  invalidPropertyType: "Missing property type.",
+  schemaRequired: "Schema value required.",
 };
 
 /**
  * Builds an error message. Key is the property in the |errors| object, and
  * |opt_replacements| is an array of values to replace "*" characters with.
  */
 chromium.JSONSchemaValidator.formatError = function(key, opt_replacements) {
   var message = this.messages[key];
   if (opt_replacements) {
     for (var i = 0; i < opt_replacements.length; i++) {
@@ skipping 29 matching lines @@
 
 /**
  * Validates an instance against a schema. The instance can be any JavaScript
  * value and will be validated recursively. When this method returns, the
  * |errors| property will contain a list of errors, if any.
  */
 chromium.JSONSchemaValidator.prototype.validate = function(instance, schema,
                                                            opt_path) {
   var path = opt_path || "";
 
+  if (!schema) {
+    this.addError(path, "schemaRequired");
+    return;
+  }
+
   // If the schema has an extends property, the instance must validate against
   // that schema too.
   if (schema.extends)
     this.validate(instance, schema.extends, path);
 
   // If the schema has a choices property, the instance must validate against at
   // least one of the items in that array.
   if (schema.choices) {
     this.validateChoices(instance, schema, path);
     return;
@@ skipping 68 matching lines @@
 };
 
 /**
  * Validates an instance against an object schema and populates the errors
  * property.
  */
 chromium.JSONSchemaValidator.prototype.validateObject = function(instance,
                                                                  schema, path) {
   for (var prop in schema.properties) {
     var propPath = path ? path + "." + prop : prop;
-    if (prop in instance && instance[prop] !== null &&
+    if (!schema.properties[prop]) {
+      this.addError(propPath, "invalidPropertyType");

[Aaron Boodman, 2009/04/28 20:21:31]

This branch will get entered when schema.properties[prop] is defined, but
contains any falsy value like: false, 0, undefined, or null. Is that what you
intended? I guess I'm not sure what this is trying to test.

[Erik does not do reviews, 2009/04/28 20:29:34]

No.  I'm looking for undefined.  The problem I'm testing for is when in the
schema you have something like this:
properties: {
  title: chromium.types.string
}

instead of

properties: {
  title: chromium.types.str
}

So I'll change to test specifically against undefined.

+    } else if (prop in instance && instance[prop] !== null &&
         instance[prop] !== undefined) {
       this.validate(instance[prop], schema.properties[prop], propPath);
     } else if (!schema.properties[prop].optional) {
       this.addError(propPath, "propertyRequired");
     }
   }
 
   // By default, additional properties are not allowed on instance objects. This
   // can be overridden by setting the additionalProperties property to a schema
   // which any additional properties must validate against.
@@ skipping 144 matching lines @@
     return {
       choice: [
         type,
         { type: "array",  item: type }
       ]
     };
   };
 
   chromium.types = types;
 })();