Merge pull request #37 from highcharts/v0.5.14

v0.5.14
highcharts · Oct 8, 2020 · 54db8a7 · 54db8a7
2 parents dc0e18b + 4ff1b03
commit 54db8a7
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 193 deletions.
diff --git a/api-docs/lib/index.js b/api-docs/lib/index.js
@@ -700,9 +700,10 @@ module.exports = function (input, outputPath, currentOnly, fn) {
         // }
 
         if (node.meta.filename) {
-            node.meta.filename = node.meta.filename.replace(/\\/g, '/').replace(/\/\//g, '/');
-            node.meta.filename = node.meta.filename.substr(node.meta.filename.indexOf('highcharts/'));
-            node.meta.filename = node.meta.filename.replace('highcharts/', '');
+            node.meta.filename = node.meta.filename
+                .replace(/\\/g, '/')
+                .replace(/\/\//g, '/')
+                .replace(/.*\/(js\/.*)/, '$1');
         }
 
         // if (typeof node.meta.default !== 'undefined' && typeof node.doclet.defaultvalue === 'undefined') {
@@ -998,6 +999,7 @@ module.exports = function (input, outputPath, currentOnly, fn) {
                 productdesc: productFilter(node.doclet, 'productdesc', product),
                 requires: requiresFilter(node.doclet, product),
                 samples: productFilter(node.doclet, 'samples', product),
+                see: node.doclet.see,
                 typeList: node.doclet.type,
                 children: node.children.map(function (child) {
                     return {

diff --git a/jsdoc/plugins/highcharts.jsdoc.js b/jsdoc/plugins/highcharts.jsdoc.js
@@ -280,14 +280,13 @@ function nodeVisitor(node, e, _, currentSourceName) {
         }
 
         if (target) {
-            if (node.type === 'CallExpression' && node.callee.name === 'seriesType') {
-                console.info('    found series type', node.arguments[0].value, '- inherited from', node.arguments[1].value);
-                // console.info('    found series type:', JSON.stringify(node.arguments[2], undefined, '  '));
-                properties = node.arguments[2].properties;
-            } else if (
+            if (
                 node.type === 'CallExpression' &&
-                node.callee.property.name === 'seriesType'
-            ) {
+                (
+                    node.callee.name === 'seriesType' ||
+                    node.callee.property.name === 'seriesType'
+                )
+             ) {
                 console.info('    found series type', node.arguments[0].value, '- inherited from', node.arguments[1].value);
                 // console.info('    found series type:', JSON.stringify(node.arguments[2], undefined, '  '));
                 properties = node.arguments[2].properties;
@@ -554,9 +553,9 @@ function inferType(obj) {
 
     if (obj.meta && obj.meta.filename) {
         // Remove user-identifiable info in filename
-        obj.meta.filename = obj.meta.filename.substr(
-            obj.meta.filename.indexOf('highcharts')
-        );
+        obj.meta.filename = obj.meta.filename
+            .replace(/\\/g, '/')
+            .replace(/.*\/(js\/.*)/, '$1');
     }
 
     // Infer types