diff --git a/hub_index_generator.mjs b/hub_index_generator.mjs index 62309c00..57d95b73 100644 --- a/hub_index_generator.mjs +++ b/hub_index_generator.mjs @@ -67,7 +67,7 @@ function parseMdFile(file, filepath) { return documentIndex } -function main() { +async function main() { const argparse = args(process.argv) if (!argparse.dir || !argparse.out) { console.error("--dir and --out must be specified") @@ -76,19 +76,15 @@ function main() { let consolidatedSearchIndex = [] - glob(argparse.dir + '/**/*.md', { ignore: argparse.ignore }, (err, files) => { - if (err) { - console.log('Error', err) - } else { - files.forEach(file => { - let ret = parseMdFile(file, argparse.dir) - if (ret) { - consolidatedSearchIndex = consolidatedSearchIndex.concat(ret) - } - }) + let files = await glob(argparse.dir + '/**/*.md', { ignore: argparse.ignore }) + + files.forEach(file => { + let ret = parseMdFile(file, argparse.dir) + if (ret) { + consolidatedSearchIndex = consolidatedSearchIndex.concat(ret) } - fs.writeFileSync(argparse.out, JSON.stringify(consolidatedSearchIndex)); }) + fs.writeFileSync(argparse.out, JSON.stringify(consolidatedSearchIndex)); } main() \ No newline at end of file diff --git a/md_parser.mjs b/md_parser.mjs index d651968e..8beb5cab 100644 --- a/md_parser.mjs +++ b/md_parser.mjs @@ -86,7 +86,7 @@ function parseMdFile(file, filepath) { return searchIndex } -function main() { +async function main() { const argparse = args(process.argv) if (!argparse.dir || !argparse.out) { console.error("--dir and --out must be specified") @@ -95,16 +95,11 @@ function main() { let consolidatedSearchIndex = [] - glob(argparse.dir + '/**/*.md', {ignore: argparse.ignore}, (err, files) => { - if (err) { - console.log('Error', err) - } else { - files.forEach(file => { - consolidatedSearchIndex = consolidatedSearchIndex.concat(parseMdFile(file, argparse.dir)) - }) - } - fs.writeFileSync(argparse.out, JSON.stringify(consolidatedSearchIndex)); + let files = await glob(argparse.dir + '/**/*.md', {ignore: argparse.ignore}) + files.forEach(file => { + consolidatedSearchIndex = consolidatedSearchIndex.concat(parseMdFile(file, argparse.dir)) }) + fs.writeFileSync(argparse.out, JSON.stringify(consolidatedSearchIndex)); } main() \ No newline at end of file diff --git a/package.json b/package.json index 0d8d6df7..c0b690bf 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "styles": "parcel watch static/sass/styles.scss --dist-dir static/css", "lint-markdown": "npx markdownlint-cli2 content/**/*.md \"#node_modules\"", "test": "npm run check-broken-links", - "build-index": "node md_parser.mjs --dir=./content/ --out=./static/data.json --ignore=./content/api/**/*", + "build-index": "node md_parser.mjs --dir=content/ --out=./static/data.json --ignore=./content/api/**/*", "check-broken-links": ".build/check-broken-links.sh", - "build-hub-index": "node hub_index_generator.mjs --dir=./content/api/hub/ --out=./static/hub-index-data.json --ignore=./content/api/hub/get_list.md," + "build-hub-index": "node hub_index_generator.mjs --dir=content/api/hub/ --out=./static/hub-index-data.json --ignore=./content/api/hub/get_list.md," } }