cleanup

Author: sofisl

src/object.js

@@ -152,7 +152,6 @@ ReflectionObject.prototype.resolve = function resolve() {
     if (this.resolved)
         return this;
     this._resolveFeatures();
-    // if (this.root instanceof Root)
     this.resolved = true; 
     return this;
 };
@@ -188,17 +187,6 @@ ReflectionObject.prototype.setOption = function setOption(name, value, ifNotSet)
     return this;
 };
 
-/**
- * Sets a feature.
- * @param {string} name Feature name
- * @param {*} value Feature value
- * @returns {ReflectionObject} `this`
- */
-ReflectionObject.prototype.setFeature = function setFeature(name, value) {
-    (this.features || (this.features = {}))[name] = value;
-    return this;
-};
-
 /**
  * Sets a parsed option.
  * @param {string} name parsed Option name
@@ -238,7 +226,7 @@ ReflectionObject.prototype.setParsedOption = function setParsedOption(name, valu
 
     if (isFeature) {
         var features = parsedOptions.find(x => {return x.hasOwnProperty("features")});
-        this._features = features.features ?? {};
+        this._features = features.features || {};
     }
     return this;
 };

src/parse.js

@@ -635,6 +635,7 @@ function parse(source, root, options) {
             if (!this.parsedOptions) {
                 this.parsedOptions = [];
             }
+            var isFeature = /features/.test(name);
             var parsedOptions = this.parsedOptions;
             if (propName) {
                 // If setting a sub property of an option then try to merge it
@@ -646,11 +647,11 @@ function parse(source, root, options) {
                     // If we found an existing option - just merge the property value
                     // (If it's a feature, will just write over)
                     var newValue = opt[name];
-                    util.setProperty(newValue, propName, value);
+                    util.setProperty(newValue, propName, value, isFeature);
                 } else {
                     // otherwise, create a new option, set its property and add it to the list
                     opt = {};
-                    opt[name] = util.setProperty({}, propName, value);
+                    opt[name] = util.setProperty({}, propName, value, isFeature);
                     parsedOptions.push(opt);
                 }
             } else {
@@ -660,10 +661,11 @@ function parse(source, root, options) {
                 parsedOptions.push(newOpt);
             }
 
-            if (/features/.test(name)) {
+            if (isFeature) {
                 var features = parsedOptions.find(x => {return x.hasOwnProperty("features")});
                 this._features = features.features || {};
             }
+            return this;
         }
         ifBlock(dummy, function parseEnumValue_block(token) {
 
@@ -723,6 +725,7 @@ function parse(source, root, options) {
     }
 
     function parseOptionValue(parent, name) {
+        // { a: "foo" b { c: "bar" } }
         if (skip("{", true)) {
             var objectResult = {};
 
@@ -741,6 +744,9 @@ function parse(source, root, options) {
                 skip(":", true);
 
                 if (peek() === "{") {
+                    // option (my_option) = {
+                    //     repeated_value: [ "foo", "bar" ]
+                    // };
                     value = parseOptionValue(parent, name + "." + token);
                 } else if (peek() === "[") {
                     value = [];

src/root.js

@@ -75,17 +75,6 @@ Root.prototype.fetch = util.fetch;
 /* istanbul ignore next */
 function SYNC() {} // eslint-disable-line no-empty-function
 
- /**
-            Root --> Messages, Extensions, services, enums
-            Messages --> Messages, Extensions, Fields, Enums, Oneofs
-            Enums --> EnumValues
-            Oneofs --> Fields
-            Services --> Methods
-
-            Fields inherit features from oneof, not message
-            Extensions inherit from the scope (file-level will inherit from the file, message-level will inherit from the message)
-            */
-
 /**
  * Loads one or multiple .proto or preprocessed .json files into this root namespace and calls the callback.
  * @param {string|string[]} filename Names of one or multiple files to load