Lazily resolve (some) cyclic dependencies, see #560

protobufjs · Dec 15, 2016 · 9c76950 · 9c76950
1 parent 9b7b92a
commit 9c76950
Show file tree

Hide file tree

Showing 14 changed files with 126 additions and 78 deletions.
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/dist/runtime/protobuf.js b/dist/runtime/protobuf.js
diff --git a/dist/runtime/protobuf.min.js b/dist/runtime/protobuf.min.js
diff --git a/dist/runtime/protobuf.min.js.gz b/dist/runtime/protobuf.min.js.gz
diff --git a/src/field.js b/src/field.js
@@ -7,12 +7,13 @@ var ReflectionObject = require("./object");
 /** @alias Field.prototype */
 var FieldPrototype = ReflectionObject.extend(Field);
 
-var Type      = require("./type"),
-    Enum      = require("./enum"),
-    MapField  = require("./mapfield"),
+var Enum      = require("./enum"),
     types     = require("./types"),
     util      = require("./util");
 
+var Type,     // cyclic
+    MapField; // cyclic
+
 var _TypeError = util._TypeError;
 
 /**
@@ -193,8 +194,11 @@ Field.testJSON = function testJSON(json) {
  * @throws {TypeError} If arguments are invalid
  */
 Field.fromJSON = function fromJSON(name, json) {
-    if (json.keyType !== undefined)
+    if (json.keyType !== undefined) {
+        if (!MapField)
+            MapField = require("./mapfield");
         return MapField.fromJSON(name, json);
+    }
     return new Field(name, json.id, json.type, json.rule, json.extend, json.options);
 };
 
@@ -225,6 +229,8 @@ FieldPrototype.resolve = function resolve() {
     // if not a basic type, resolve it
     if (typeDefault === undefined) {
         var resolved = this.parent.lookup(this.type);
+        if (!Type)
+            Type = require("./type");
         if (resolved instanceof Type) {
             this.resolvedType = resolved;
             typeDefault = null;

diff --git a/src/index.js b/src/index.js
@@ -117,7 +117,6 @@ protobuf.configure        = configure;
  * @returns {undefined}
  */
 function configure() {
-    util._configure();
     Reader._configure();
 }