Lazily require types when validating Extensions API calls

chrome/renderer/resources/extensions/json_schema.js

 // Copyright (c) 2012 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 22 matching lines @@
 // - null counts as 'unspecified' for optional values
 // - added the 'choices' property, to allow specifying a list of possible types
 //   for a value
 // - by default an "object" typed schema does not allow additional properties.
 //   if present, "additionalProperties" is to be a schema against which all
 //   additional properties will be validated.
 //==============================================================================
 
 // TODO(cduvall): Make this file not depend on chromeHidden.
 var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
-var loadRefDependency = require('utils').loadRefDependency;
+var loadTypeSchema = require('utils').loadTypeSchema;
+var CHECK = requireNative('logging').CHECK;
 
 function isInstanceOfClass(instance, className) {
   if (!instance)
     return false;
 
   if (Object.prototype.toString.call(instance) == "[object " + className + "]")
     return true;
 
   return isInstanceOfClass(Object.getPrototypeOf(instance), className);
 }
@@ skipping 115 matching lines @@
     function(schema) {
   var schemaTypes = [];
   if (schema.type)
     schemaTypes.push(schema.type);
   if (schema.choices) {
     for (var i = 0; i < schema.choices.length; i++) {
       var choiceTypes = this.getAllTypesForSchema(schema.choices[i]);
       schemaTypes = schemaTypes.concat(choiceTypes);
     }
   }
-  if (schema['$ref']) {
-    var refTypes = this.getAllTypesForSchema(this.types[schema['$ref']]);
-    schemaTypes = schemaTypes.concat(refTypes);
+  var ref = schema['$ref'];
+  if (ref) {
+    var type = this.getOrAddType(ref);
+    CHECK(type, 'Could not find type ' + ref);
+    schemaTypes = schemaTypes.concat(this.getAllTypesForSchema(type));
   }
   return schemaTypes;
 };
 
+chromeHidden.JSONSchemaValidator.prototype.getOrAddType = function(typeName) {
+  if (!this.types[typeName])
+    this.types[typeName] = loadTypeSchema(typeName);
+  return this.types[typeName];
+};
+
 /**
  * Returns true if |schema| would accept an argument of type |type|.
  */
 chromeHidden.JSONSchemaValidator.prototype.isValidSchemaType =
     function(type, schema) {
   if (type == 'any')
     return true;
 
   // TODO(kalman): I don't understand this code. How can type be "null"?
   if (schema.optional && (type == "null" || type == "undefined"))
@@ skipping 40 matching lines @@
   if (schema.id)
     this.types[schema.id] = schema;
 
   // 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 $ref property, the instance must validate against
   // that schema too. It must be present in this.types to be referenced.
-  if (schema["$ref"]) {
-    loadRefDependency(schema["$ref"]);
-    if (!this.types[schema["$ref"]])
-      this.addError(path, "unknownSchemaReference", [ schema["$ref"] ]);
+  var ref = schema["$ref"];
+  if (ref) {
+    if (!this.getOrAddType(ref))
+      this.addError(path, "unknownSchemaReference", [ ref ]);
     else
-      this.validate(instance, this.types[schema["$ref"]], path)
+      this.validate(instance, this.types[ref], path)

[not at google - send to devlin, 2013/03/21 01:36:55]

accessing this.types[ref] here kind of defeats the point of adding that
getOrAddType method.

[cduvall, 2013/03/21 17:16:07]

Done.

   }
 
   // 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;
   }
 
   // If the schema has an enum property, the instance must be one of those
@@ skipping 247 matching lines @@
     message: chromeHidden.JSONSchemaValidator.formatError(key, replacements)
   });
 };
 
 /**
  * Resets errors to an empty list so you can call 'validate' again.
  */
 chromeHidden.JSONSchemaValidator.prototype.resetErrors = function() {
   this.errors = [];
 };