Merge pull request #40 from tineheller/master

Fixes for callbacks and inner module members
otris · Aug 15, 2018 · f6836e6 · f6836e6
2 parents 4099044 + 790e856
commit f6836e6
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 4 deletions.
diff --git a/exampleProject/src/core/myModule2.js b/exampleProject/src/core/myModule2.js
@@ -0,0 +1,22 @@
+/**
+ * @module myModule2
+ */
+/**
+ * exported function
+ * @function myFunction1
+ * @param {string} myString
+ * @param {testCallback} myCallback
+ * @static
+ */
+/**
+ * exported callback
+ * @callback testCallback
+ * @param {string} testCBParam
+ * @static
+ */
+
+/**
+ * inner function
+ * @function myFunction2
+ * @param {string} myString
+ */
diff --git a/exampleProject/src/core/myModule3.js b/exampleProject/src/core/myModule3.js
@@ -0,0 +1,21 @@
+/**
+ * @module myModule3
+ */
+module.exports = {
+    /**
+     * exported function
+     * @param {string} param1
+     * @return {string}
+     */
+    myFunction1: function(param1, color2) {
+        // ...
+    },
+    /**
+     * inner function
+     * @param {string} param2
+     * @inner
+     */
+    myFunction2: function(param2) {
+        // ...
+    },
+};
diff --git a/src/core/jsdoc-tsd-parser.ts b/src/core/jsdoc-tsd-parser.ts
@@ -211,7 +211,7 @@ export class JSDocTsdParser {
 
 								case "const":
 									let constDeclaration = dom.create.const((namespaceMember as dom.ConstDeclaration).name, (namespaceMember as dom.ConstDeclaration).type);
-									if (!parsedItem.flags || 0 === (parsedItem.flags & dom.DeclarationFlags.Private)) {
+									if (parsedItem.flags && ((parsedItem.flags & dom.DeclarationFlags.Export) || (parsedItem.flags & dom.DeclarationFlags.Static))) {
 										constDeclaration.flags = dom.DeclarationFlags.Export;
 									}
 									constDeclaration.comment = namespaceMember.comment;
@@ -221,7 +221,7 @@ export class JSDocTsdParser {
 
 								case "property":
 									let variableDeclaration = dom.create.variable((namespaceMember as dom.VariableDeclaration).name, (namespaceMember as dom.VariableDeclaration).type);
-									if (!parsedItem.flags || 0 === (parsedItem.flags & dom.DeclarationFlags.Private)) {
+									if (parsedItem.flags && ((parsedItem.flags & dom.DeclarationFlags.Export) || (parsedItem.flags & dom.DeclarationFlags.Static))) {
 										variableDeclaration.flags = dom.DeclarationFlags.Export;
 									}
 									variableDeclaration.comment = namespaceMember.comment;
@@ -320,7 +320,7 @@ export class JSDocTsdParser {
 
 								case "property":
 									let variableDeclaration = dom.create.variable((moduleMember as dom.VariableDeclaration).name, (moduleMember as dom.VariableDeclaration).type);
-									if (!parsedItem.flags || 0 === (parsedItem.flags & dom.DeclarationFlags.Private)) {
+									if (parsedItem.flags && ((parsedItem.flags & dom.DeclarationFlags.Export) || (parsedItem.flags & dom.DeclarationFlags.Static))) {
 										variableDeclaration.flags = dom.DeclarationFlags.Export;
 									}
 									variableDeclaration.comment = moduleMember.comment;
@@ -329,7 +329,8 @@ export class JSDocTsdParser {
 									break;
 
 								case "function":
-									if (!parsedItem.flags || 0 === (parsedItem.flags & dom.DeclarationFlags.Private)) {
+								case "alias":
+									if (parsedItem.flags && ((parsedItem.flags & dom.DeclarationFlags.Export) || (parsedItem.flags & dom.DeclarationFlags.Static))) {
 										moduleMember.flags = dom.DeclarationFlags.Export;
 									}
 									(parentItem as dom.ModuleDeclaration).members.push(moduleMember);