doc, tools: meet dependencies

test/doctool/test-doctool-html.js

@@ -5,7 +5,7 @@ const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
 
-const html = require('../../tools/doc/html.js');
+const html = require('../../tools/doc/html.js').toHTML;
 
 // Test data is a list of objects with two properties.
 // The file property is the file path.

tools/doc/generate.js

@@ -48,7 +48,7 @@ function next(er, input) {
       break;
 
     case 'html':
-      require('./html.js')(input, inputFile, template, nodeVersion,
+      require('./html.js').toHTML(input, inputFile, template, nodeVersion,
         function(er, html) {
           if (er) throw er;
           console.log(html);

tools/doc/html.js

@@ -1,33 +1,5 @@
 'use strict';
-
-const common = require('./common.js');
-const fs = require('fs');
 const marked = require('marked');
-const path = require('path');
-const preprocess = require('./preprocess.js');
-const typeParser = require('./type-parser.js');
-
-const linkManPages = require('./lib/linkManPages')
-const parseText = require('./lib/parseText')
 const toHTML = require('./lib/toHTML')
-const loadGtoc = require('./lib/loadGtoc')
-const toID = require('./lib/toID')
-const render = require('./lib/render')
-const parseLists = require('./lib/parseLists')
-const parseYAML = require('./lib/parseYAML')
-const linkJsTypeDocs = require('./lib/linkJsTypeDocs')
-const parseAPIHeader = require('./lib/parseAPIHeader')
-const getSection = require('./lib/getSection')
-const buildToc = require('./lib/buildToc')
-const getId = require('./lib/getId')
-
-module.exports = toHTML;
 
-// customized heading without id attribute
-var renderer = new marked.Renderer();
-renderer.heading = function(text, level) {
-  return '<h' + level + '>' + text + '</h' + level + '>\n';
-};
-marked.setOptions({
-  renderer: renderer
-});
+module.exports.toHTML = toHTML;

tools/doc/lib/buildToc.js

@@ -1,3 +1,6 @@
+const marked = require('marked')
+const toID = require('./toID.js');
+const getId = require('./getId.js');
 
 module.exports = function buildToc(lexed, filename, cb) {
   var toc = [];

tools/doc/lib/linkJsTypeDocs.js

@@ -1,3 +1,5 @@
+const typeParser = require('../type-parser.js');
+
 module.exports = function linkJsTypeDocs(text) {
   var parts = text.split('`');
   var i;

tools/doc/lib/loadGtoc.js

@@ -1,17 +1,23 @@
+const path = require('path')
+const fs = require('fs')
+const marked = require('marked')
+const preprocess = require('../preprocess.js');
+const toID = require('./toID.js');
 // TODO(chrisdickinson): never stop vomitting / fix this.
 var gtocPath = path.resolve(path.join(
   __dirname,
   '..',
   '..',
+  '..',
   'doc',
   'api',
   '_toc.md'
 ));
-var gtocLoading = null;
-var gtocData = null;
+global.global.gtocLoading = null;
+global.gtocData = null;
 
 
-module.epxorts = function loadGtoc(cb) {
+exports.loadGtoc = (cb) => {
   fs.readFile(gtocPath, 'utf8', function(err, data) {
     if (err) return cb(err);
 

tools/doc/lib/parseLists.js

@@ -1,4 +1,6 @@
-
+const common = require('../common.js');
+const parseAPIHeader = require('./parseAPIHeader.js');
+const parseYAML = require('./parseYAML.js');
 // just update the list item text in-place.
 // lists that come right after a heading are what we're after.
 module.exports = function parseLists(input) {

tools/doc/lib/parseText.js

@@ -1,3 +1,5 @@
+const linkManPages = require('./linkManPages')
+const linkJsTypeDocs = require('./linkJsTypeDocs')
 // handle general body-text replacements
 // for example, link man page references to the actual page
 module.exports = function parseText(lexed) {

tools/doc/lib/parseYAML.js

@@ -1,3 +1,5 @@
+const common = require('../common.js');
+
 module.exports = function parseYAML(text) {
   const meta = common.extractAndParseYAML(text);
   const html = ['<div class="api_metadata">'];

tools/doc/lib/render.js

@@ -1,3 +1,11 @@
+const path = require('path')
+const marked = require('marked')
+const getSection = require('./getSection')
+const parseText = require('./parseText')
+const parseLists = require('./parseLists')
+const buildToc = require('./buildToc')
+const toID = require('./toID.js');
+
 module.exports = function render(lexed, filename, template, nodeVersion, cb) {
   if (typeof nodeVersion === 'function') {
     cb = nodeVersion;
@@ -28,7 +36,7 @@ module.exports = function render(lexed, filename, template, nodeVersion, cb) {
     template = template.replace(/__TOC__/g, toc);
     template = template.replace(
       /__GTOC__/g,
-      gtocData.replace('class="nav-' + id, 'class="nav-' + id + ' active')
+      global.gtocData.replace('class="nav-' + id, 'class="nav-' + id + ' active')
     );
 
     // content has to be the last thing we do with

tools/doc/lib/toHTML.js

@@ -1,27 +1,42 @@
+const fs = require('fs')
+const loadGtoc = require('./loadGtoc').loadGtoc
+const render = require('./render')
+const marked = require('marked')
+
+// customized heading without id attribute
+var renderer = new marked.Renderer();
+renderer.heading = function(text, level) {
+  return '<h' + level + '>' + text + '</h' + level + '>\n';
+};
+marked.setOptions({
+  renderer: renderer
+});
+
+
 module.exports = function toHTML(input, filename, template, nodeVersion, cb) {
   if (typeof nodeVersion === 'function') {
     cb = nodeVersion;
     nodeVersion = null;
   }
   nodeVersion = nodeVersion || process.version;
 
-  if (gtocData) {
+  if (global.gtocData) {
     return onGtocLoaded();
   }
 
-  if (gtocLoading === null) {
-    gtocLoading = [onGtocLoaded];
+  if (global.gtocLoading === null) {
+    global.gtocLoading = [onGtocLoaded];
     return loadGtoc(function(err, data) {
       if (err) throw err;
-      gtocData = data;
-      gtocLoading.forEach(function(xs) {
+      global.gtocData = data;
+      global.gtocLoading.forEach(function(xs) {
         xs();
       });
     });
   }
 
-  if (gtocLoading) {
-    return gtocLoading.push(onGtocLoaded);
+  if (global.gtocLoading) {
+    return global.gtocLoading.push(onGtocLoaded);
   }
 
   function onGtocLoaded() {