TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-30 11:54:33 +03:00
Code Issues Projects Releases Wiki Activity

Refactored remaining function in package-json lib to use async-await

Browse Source 
- this helps simplify the code and gets rid of Promise chaining
- apparently I can't easily use an async function within filter, so I've
  left it for now
This commit is contained in:
Daniel Lockyer 2020-11-25 10:44:15 +00:00
parent 18b87d9734
commit d4b15141a0
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/server/lib/fs/package-json/package-json.js
View File

@ -150,10 +150,10 @@ module.exports = class PackageJson {
}
}
readPackages(packagePath) {
const self = this;
async readPackages(packagePath) {
const dirContents = await fs.readdir(packagePath);
return Promise.resolve(fs.readdir(packagePath))
const packageNames = dirContents
.filter(function (packageName) {
// Filter out things which are not packages by regex
if (packageName.match(notAPackageRegex)) {
@ -163,13 +163,14 @@ module.exports = class PackageJson {
return fs.stat(join(packagePath, packageName)).then(function (stat) {
return stat.isDirectory();
});
})
.map(function readPackageJson(packageName) {
const absolutePath = join(packagePath, packageName);
return self.processPackage(absolutePath, packageName);
})
.then(function (packages) {
return _.keyBy(packages, 'name');
});
const packages = await Promise.all(packageNames
.map((packageName) => {
const absolutePath = join(packagePath, packageName);
return this.processPackage(absolutePath, packageName);
}));
return _.keyBy(packages, 'name');
}
};