Skip to content

Commit f7675c8

Browse files
bump version
1 parent 5828746 commit f7675c8

3 files changed

Lines changed: 34 additions & 37 deletions

File tree

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@4dsas/doc_preprocessing",
3-
"version": "1.1.9",
3+
"version": "1.1.10",
44
"description": "Preprocess 4D doc to be built by docusaurus",
55
"main": "preprocessing.js",
66
"type": "commonjs",

preprocessing.js

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const yargs = require('yargs');
66
const args = yargs.argv
77
const path = require('path')
88
const fs = require('fs')
9-
const {glob} = require("glob");
9+
const { Glob } = require("glob");
1010

1111

1212
function write(inPath, newContent) {
@@ -44,55 +44,52 @@ function preprocessMultipleFolders(inTargetPath, info) {
4444
if (listLanguages.length > 0) {
4545
for (let language of listLanguages) {
4646
const targetPath = replaceLanguage(inTargetPath, language)
47+
const g = new Glob(targetPath, { mark: true })
4748

48-
glob(targetPath, (error, folders) => {
49-
for (const folder of folders) {
49+
for (const folder of g) {
5050

51-
let i = info.clone()
52-
const syntaxOutput = i.getString(settings.SETTINGS_KEY.SYNTAX_OUTPUT)
53-
const outputPath = path.join(i.getString(settings.SETTINGS_KEY.OUTPUT), folder)
54-
i.set(settings.SETTINGS_KEY.OUTPUT, outputPath)
55-
i.set(settings.SETTINGS_KEY.PATH, folder)
56-
i.set(settings.SETTINGS_KEY.SYNTAX_OUTPUT, replaceLanguage(syntaxOutput, language))
57-
i.set(settings.SETTINGS_KEY.LIST_ARGS, { "language": language })
58-
59-
let listExclusions = i.getArray(settings.SETTINGS_KEY.EXCLUDE_LIST)
60-
if (listExclusions) {
61-
listExclusions.map(x => replaceLanguage(x, language))
62-
i.set(settings.SETTINGS_KEY.EXCLUDE_LIST, listExclusions)
63-
}
64-
65-
listPromises.push(Preprocess(i))
66-
}
67-
Promise.all(listPromises).then(() => { resolve() })
68-
})
69-
}
70-
}
71-
else {
72-
let listPromises = [];
73-
glob(inTargetPath, (error, folders) => {
74-
75-
for (let folder of folders) {
7651
let i = info.clone()
52+
const syntaxOutput = i.getString(settings.SETTINGS_KEY.SYNTAX_OUTPUT)
7753
const outputPath = path.join(i.getString(settings.SETTINGS_KEY.OUTPUT), folder)
7854
i.set(settings.SETTINGS_KEY.OUTPUT, outputPath)
7955
i.set(settings.SETTINGS_KEY.PATH, folder)
80-
const syntaxOutput = i.getString(settings.SETTINGS_KEY.SYNTAX_OUTPUT);
81-
i.set(settings.SETTINGS_KEY.SYNTAX_OUTPUT, syntaxOutput)
56+
i.set(settings.SETTINGS_KEY.SYNTAX_OUTPUT, replaceLanguage(syntaxOutput, language))
57+
i.set(settings.SETTINGS_KEY.LIST_ARGS, { "language": language })
58+
59+
let listExclusions = i.getArray(settings.SETTINGS_KEY.EXCLUDE_LIST)
60+
if (listExclusions) {
61+
listExclusions.map(x => replaceLanguage(x, language))
62+
i.set(settings.SETTINGS_KEY.EXCLUDE_LIST, listExclusions)
63+
}
8264

8365
listPromises.push(Preprocess(i))
8466
}
85-
Promise.all(listPromises).finally(() => { resolve() })
86-
});
87-
67+
Promise.all(listPromises).then(() => { resolve() })
68+
}
69+
}
70+
else {
71+
let listPromises = [];
72+
console.log(path.resolve(inTargetPath))
73+
const g = new Glob(inTargetPath, { mark: true })
74+
for (let folder of g) {
75+
let i = info.clone()
76+
const outputPath = path.join(i.getString(settings.SETTINGS_KEY.OUTPUT), folder)
77+
i.set(settings.SETTINGS_KEY.OUTPUT, outputPath)
78+
i.set(settings.SETTINGS_KEY.PATH, folder)
79+
const syntaxOutput = i.getString(settings.SETTINGS_KEY.SYNTAX_OUTPUT);
80+
i.set(settings.SETTINGS_KEY.SYNTAX_OUTPUT, syntaxOutput)
81+
82+
listPromises.push(Preprocess(i))
83+
}
84+
Promise.all(listPromises).finally(() => { resolve() })
8885
}
8986
})
9087
}
9188

9289
const info = new settings.Settings()
9390
info.load(args)
94-
9591
let pathToProcess = info.getString(settings.SETTINGS_KEY.PATH);
92+
9693
if (pathToProcess.length > 0) {
9794

9895
async function run(info) {

0 commit comments

Comments
 (0)