jsdoc: simplify type iteration logic

Author: Alexej Yaroshevich

lib/jsdoc.js

@@ -326,13 +326,13 @@ function _iterateDocTypes(node, cb) {
         // unknown: boolean,
         // types: Array.<TypeName|GenericType|FunctionType|RecordType>
         res = node.types.map(function(subnode) {
-            if (node.selfNode) {
-                subnode.parentNode = node.selfNode;
+            if (node.collectionNode) {
+                subnode.parentNode = node.collectionNode;
             }
             return _iterateDocTypes(subnode, cb);
         }) || [];
         if (node.nullable) {
-            var subnode = {typeName: 'null', parentNode: node};
+            var subnode = {typeName: 'null', collectionNode: node};
             res.concat(cb(subnode));
         }
         break;
@@ -346,11 +346,14 @@ function _iterateDocTypes(node, cb) {
     case node instanceof TypeBuilder.GenericType:
         // genericTypeName: string,
         // parameterTypeUnions: Array.<TypeUnion>
-        node.typeName = node.genericTypeName;
-        res = cb(node);
+        node.typeName = node.genericTypeName.type;
+        res = cb(node) || [];
         if (node.parameterTypeUnions) {
-            node.parameterTypeUnions.selfNode = node;
-            res.concat(_iterateDocTypes(node.parameterTypeUnions, cb));
+            // node.parameterTypeUnions.collectionNode = node;
+            res.concat(node.parameterTypeUnions.map(function(subnode) {
+                subnode.parentNode = node;
+                _iterateDocTypes(subnode, cb);
+            }));
         }
         break;
 
@@ -366,11 +369,11 @@ function _iterateDocTypes(node, cb) {
             _iterateDocTypes(subnode, cb);
         }));
         if (node.returnTypeUnion) {
-            node.returnTypeUnion.selfNode = node;
+            node.returnTypeUnion.collectionNode = node;
             res.concat(_iterateDocTypes(node.returnTypeUnion, cb));
         }
         if (node.contextTypeUnion) {
-            node.contextTypeUnion.selfNode = node;
+            node.contextTypeUnion.collectionNode = node;
             res.concat(_iterateDocTypes(node.contextTypeUnion, cb));
         }
         break;
@@ -390,7 +393,7 @@ function _iterateDocTypes(node, cb) {
     case node instanceof TypeBuilder.RecordType.Entry:
         // name: string,
         // typeUnion: TypeUnion
-        node.typeUnion.selfNode = node;
+        node.typeUnion.collectionNode = node;
         res = _iterateDocTypes(node.typeUnion, cb);
         break;
 
@@ -415,68 +418,11 @@ function _iterateDocTypes(node, cb) {
  */
 function _simplifyType(node) {
     var res = [];
-
-    switch (true) {
-    case node instanceof TypeBuilder.TypeUnion:
-        // optional: boolean,
-        // nullable: boolean,
-        // variable: boolean,
-        // nonNullable: boolean,
-        // all: boolean,
-        // unknown: boolean,
-        // types: Array.<TypeName|GenericType|FunctionType|RecordType>
-        res = node.types.map(_simplifyType);
-        if (node.nullable) {
-            res.push({type: 'null'});
+    _iterateDocTypes(node, function(type) {
+        if (!type.parentNode && (!type.collectionNode || !type.collectionNode.parentNode)) {
+            res.push({type: type.typeName});
         }
-        break;
-
-    case node instanceof TypeBuilder.TypeName:
-        // name: string
-        res = {type: node.name};
-        break;
-
-    case node instanceof TypeBuilder.GenericType:
-        // genericTypeName: string,
-        // parameterTypeUnions: Array.<TypeUnion>
-        res = {type: node.genericTypeName.type};
-        // node.parameterTypeUnions.map(_simplifyType);
-        break;
-
-    case node instanceof TypeBuilder.FunctionType:
-        // parameterTypeUnions: Array.<TypeUnion>,
-        // returnTypeUnion: TypeUnion|null,
-        // isConstructor: boolean,
-        // contextTypeUnion: TypeUnion|null
-        res = {type: 'function'};
-        // node.parameterTypeUnions.map(_simplifyType);
-        // if (node.returnTypeUnion) {
-        //     _simplifyType(node.returnTypeUnion);
-        // }
-        // if (node.contextTypeUnion) {
-        //     _simplifyType(node.contextTypeUnion);
-        // }
-        break;
-
-    case node instanceof TypeBuilder.RecordType:
-        // entries: Array.<RecordEntry>
-        res = {type: 'object'}; // node.entries.map(_simplifyType);
-        break;
-
-    case node instanceof TypeBuilder.RecordType.Entry:
-        // name: string,
-        // typeUnion: TypeUnion
-        res = _simplifyType(node.typeUnion);
-        break;
-
-    case node instanceof TypeBuilder.ModuleName:
-        res = {type: node.name, module: true};
-        break;
-
-    default:
-        throw new Error('DocType: Unsupported doc node');
-    }
-
+    });
     return res;
 }