@docusaurus/plugin-content-blog 0.0.0-4339 → 0.0.0-4350

package/lib/authors.d.ts

@@ -7,14 +7,11 @@
 import { Author, BlogContentPaths } from './types';
 import { BlogPostFrontMatter } from './blogFrontMatter';
 export declare type AuthorsMap = Record<string, Author>;
-export declare function validateAuthorsMapFile(content: unknown): AuthorsMap;
-export declare function readAuthorsMapFile(filePath: string): Promise<AuthorsMap | undefined>;
-declare type AuthorsMapParams = {
+export declare function validateAuthorsMap(content: unknown): AuthorsMap;
+export declare function getAuthorsMap(params: {
     authorsMapPath: string;
     contentPaths: BlogContentPaths;
-};
-export declare function getAuthorsMapFilePath({ authorsMapPath, contentPaths, }: AuthorsMapParams): Promise<string | undefined>;
-export declare function getAuthorsMap(params: AuthorsMapParams): Promise<AuthorsMap | undefined>;
+}): Promise<AuthorsMap | undefined>;
 declare type AuthorsParam = {
     frontMatter: BlogPostFrontMatter;
     authorsMap: AuthorsMap | undefined;

package/lib/authors.js

@@ -6,15 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBlogPostAuthors = exports.getAuthorsMap = exports.getAuthorsMapFilePath = exports.readAuthorsMapFile = exports.validateAuthorsMapFile = void 0;
-const tslib_1 = require("tslib");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+exports.getBlogPostAuthors = exports.getAuthorsMap = exports.validateAuthorsMap = void 0;
 const utils_1 = require("@docusaurus/utils");
 const utils_validation_1 = require("@docusaurus/utils-validation");
-const blogUtils_1 = require("./blogUtils");
-const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
 const AuthorsMapSchema = utils_validation_1.Joi.object().pattern(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
     name: utils_validation_1.Joi.string().required(),
     url: utils_validation_1.URISchema,
@@ -24,48 +18,16 @@ const AuthorsMapSchema = utils_validation_1.Joi.object().pattern(utils_validatio
     .rename('image_url', 'imageURL')
     .unknown()
     .required());
-function validateAuthorsMapFile(content) {
+function validateAuthorsMap(content) {
     return utils_validation_1.Joi.attempt(content, AuthorsMapSchema);
 }
-exports.validateAuthorsMapFile = validateAuthorsMapFile;
-async function readAuthorsMapFile(filePath) {
-    if (await fs_extra_1.default.pathExists(filePath)) {
-        const contentString = await fs_extra_1.default.readFile(filePath, { encoding: 'utf8' });
-        try {
-            const unsafeContent = js_yaml_1.default.load(contentString);
-            return validateAuthorsMapFile(unsafeContent);
-        }
-        catch (e) {
-            // TODO replace later by error cause: see https://v8.dev/features/error-cause
-            logger_1.default.error('The author list file looks invalid!');
-            throw e;
-        }
-    }
-    return undefined;
-}
-exports.readAuthorsMapFile = readAuthorsMapFile;
-async function getAuthorsMapFilePath({ authorsMapPath, contentPaths, }) {
-    // Useful to load an eventually localize authors map
-    const contentPath = await (0, utils_1.findFolderContainingFile)((0, blogUtils_1.getContentPathList)(contentPaths), authorsMapPath);
-    if (contentPath) {
-        return path_1.default.join(contentPath, authorsMapPath);
-    }
-    return undefined;
-}
-exports.getAuthorsMapFilePath = getAuthorsMapFilePath;
+exports.validateAuthorsMap = validateAuthorsMap;
 async function getAuthorsMap(params) {
-    const filePath = await getAuthorsMapFilePath(params);
-    if (!filePath) {
-        return undefined;
-    }
-    try {
-        return await readAuthorsMapFile(filePath);
-    }
-    catch (e) {
-        // TODO replace later by error cause, see https://v8.dev/features/error-cause
-        logger_1.default.error `Couldn't read blog authors map at path=${filePath}`;
-        throw e;
-    }
+    return (0, utils_1.getDataFileData)({
+        filePath: params.authorsMapPath,
+        contentPaths: params.contentPaths,
+        fileType: 'authors map',
+    }, validateAuthorsMap);
 }
 exports.getAuthorsMap = getAuthorsMap;
 // Legacy v1/early-v2 frontmatter fields

package/lib/blogUtils.d.ts

@@ -21,5 +21,4 @@ export declare type LinkifyParams = {
     fileString: string;
 } & Pick<BlogMarkdownLoaderOptions, 'sourceToPermalink' | 'siteDir' | 'contentPaths' | 'onBrokenMarkdownLink'>;
 export declare function linkify({ filePath, contentPaths, fileString, siteDir, sourceToPermalink, onBrokenMarkdownLink, }: LinkifyParams): string;
-export declare function getContentPathList(contentPaths: BlogContentPaths): string[];
 export {};

package/lib/blogUtils.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContentPathList = exports.linkify = exports.generateBlogPosts = exports.parseBlogFileName = exports.getBlogTags = exports.getSourceToPermalink = exports.truncate = void 0;
+exports.linkify = exports.generateBlogPosts = exports.parseBlogFileName = exports.getBlogTags = exports.getSourceToPermalink = exports.truncate = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
@@ -80,7 +80,7 @@ async function processBlogSourceFile(blogSourceRelative, contentPaths, context,
     const { siteConfig: { baseUrl }, siteDir, i18n, } = context;
     const { routeBasePath, tagsBasePath: tagsRouteBasePath, truncateMarker, showReadingTime, editUrl, } = options;
     // Lookup in localized folder in priority
-    const blogDirPath = await (0, utils_1.getFolderContainingFile)(getContentPathList(contentPaths), blogSourceRelative);
+    const blogDirPath = await (0, utils_1.getFolderContainingFile)((0, utils_1.getContentPathList)(contentPaths), blogSourceRelative);
     const blogSourceAbsolute = path_1.default.join(blogDirPath, blogSourceRelative);
     const { frontMatter, content, contentTitle, excerpt } = await parseBlogPostMarkdownFile(blogSourceAbsolute);
     const aliasedSource = (0, utils_1.aliasedSitePath)(blogSourceAbsolute, siteDir);
@@ -203,8 +203,3 @@ function linkify({ filePath, contentPaths, fileString, siteDir, sourceToPermalin
     return newContent;
 }
 exports.linkify = linkify;
-// Order matters: we look in priority in localized folder
-function getContentPathList(contentPaths) {
-    return [contentPaths.contentPathLocalized, contentPaths.contentPath];
-}
-exports.getContentPathList = getContentPathList;

package/lib/index.js

@@ -15,7 +15,6 @@ const translations_1 = require("./translations");
 const pluginOptionSchema_1 = require("./pluginOptionSchema");
 const blogUtils_1 = require("./blogUtils");
 const feed_1 = require("./feed");
-const authors_1 = require("./authors");
 async function pluginContentBlog(context, options) {
     var _a;
     if (options.admonitions) {
@@ -38,15 +37,15 @@ async function pluginContentBlog(context, options) {
     const pluginDataDirRoot = path_1.default.join(generatedFilesDir, 'docusaurus-plugin-content-blog');
     const dataDir = path_1.default.join(pluginDataDirRoot, pluginId);
     const aliasedSource = (source) => `~blog/${(0, utils_1.posixPath)(path_1.default.relative(pluginDataDirRoot, source))}`;
-    const authorsMapFilePath = await (0, authors_1.getAuthorsMapFilePath)({
-        authorsMapPath: options.authorsMapPath,
+    const authorsMapFilePath = await (0, utils_1.getDataFilePath)({
+        filePath: options.authorsMapPath,
         contentPaths,
     });
     return {
         name: 'docusaurus-plugin-content-blog',
         getPathsToWatch() {
             const { include } = options;
-            const contentMarkdownGlobs = (0, blogUtils_1.getContentPathList)(contentPaths).flatMap((contentPath) => include.map((pattern) => `${contentPath}/${pattern}`));
+            const contentMarkdownGlobs = (0, utils_1.getContentPathList)(contentPaths).flatMap((contentPath) => include.map((pattern) => `${contentPath}/${pattern}`));
             return [authorsMapFilePath, ...contentMarkdownGlobs].filter(Boolean);
         },
         async getTranslationFiles() {
@@ -275,7 +274,7 @@ async function pluginContentBlog(context, options) {
                     (0, utils_1.reportMessage)(`Blog markdown link couldn't be resolved: (${brokenMarkdownLink.link}) in ${brokenMarkdownLink.filePath}`, onBrokenMarkdownLinks);
                 },
             };
-            const contentDirs = (0, blogUtils_1.getContentPathList)(contentPaths);
+            const contentDirs = (0, utils_1.getContentPathList)(contentPaths);
             return {
                 resolve: {
                     alias: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "0.0.0-4339",
+  "version": "0.0.0-4350",
   "description": "Blog plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-blog.d.ts",
@@ -18,16 +18,15 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4339",
-    "@docusaurus/logger": "0.0.0-4339",
-    "@docusaurus/mdx-loader": "0.0.0-4339",
-    "@docusaurus/utils": "0.0.0-4339",
-    "@docusaurus/utils-validation": "0.0.0-4339",
+    "@docusaurus/core": "0.0.0-4350",
+    "@docusaurus/logger": "0.0.0-4350",
+    "@docusaurus/mdx-loader": "0.0.0-4350",
+    "@docusaurus/utils": "0.0.0-4350",
+    "@docusaurus/utils-validation": "0.0.0-4350",
     "escape-string-regexp": "^4.0.0",
     "feed": "^4.2.2",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.2",
-    "js-yaml": "^4.0.0",
     "loader-utils": "^2.0.0",
     "lodash": "^4.17.20",
     "reading-time": "^1.5.0",
@@ -37,7 +36,7 @@
     "webpack": "^5.61.0"
   },
   "devDependencies": {
-    "@docusaurus/types": "0.0.0-4339"
+    "@docusaurus/types": "0.0.0-4350"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
@@ -46,5 +45,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "7501212bc6f7ca3578856c53ab6cb55974693930"
+  "gitHead": "395433a6f915dd0e6d73223228968fdc58761fd0"
 }

package/src/authors.ts

@@ -5,19 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import fs from 'fs-extra';
-import logger from '@docusaurus/logger';
-import path from 'path';
 import {Author, BlogContentPaths} from './types';
-import {findFolderContainingFile} from '@docusaurus/utils';
+import {getDataFileData} from '@docusaurus/utils';
 import {Joi, URISchema} from '@docusaurus/utils-validation';
 import {
   BlogPostFrontMatter,
   BlogPostFrontMatterAuthor,
   BlogPostFrontMatterAuthors,
 } from './blogFrontMatter';
-import {getContentPathList} from './blogUtils';
-import Yaml from 'js-yaml';
 
 export type AuthorsMap = Record<string, Author>;
 
@@ -34,63 +29,22 @@ const AuthorsMapSchema = Joi.object<AuthorsMap>().pattern(
     .required(),
 );
 
-export function validateAuthorsMapFile(content: unknown): AuthorsMap {
+export function validateAuthorsMap(content: unknown): AuthorsMap {
   return Joi.attempt(content, AuthorsMapSchema);
 }
 
-export async function readAuthorsMapFile(
-  filePath: string,
-): Promise<AuthorsMap | undefined> {
-  if (await fs.pathExists(filePath)) {
-    const contentString = await fs.readFile(filePath, {encoding: 'utf8'});
-    try {
-      const unsafeContent = Yaml.load(contentString);
-      return validateAuthorsMapFile(unsafeContent);
-    } catch (e) {
-      // TODO replace later by error cause: see https://v8.dev/features/error-cause
-      logger.error('The author list file looks invalid!');
-      throw e;
-    }
-  }
-  return undefined;
-}
-
-type AuthorsMapParams = {
+export async function getAuthorsMap(params: {
   authorsMapPath: string;
   contentPaths: BlogContentPaths;
-};
-
-export async function getAuthorsMapFilePath({
-  authorsMapPath,
-  contentPaths,
-}: AuthorsMapParams): Promise<string | undefined> {
-  // Useful to load an eventually localize authors map
-  const contentPath = await findFolderContainingFile(
-    getContentPathList(contentPaths),
-    authorsMapPath,
+}): Promise<AuthorsMap | undefined> {
+  return getDataFileData(
+    {
+      filePath: params.authorsMapPath,
+      contentPaths: params.contentPaths,
+      fileType: 'authors map',
+    },
+    validateAuthorsMap,
   );
-
-  if (contentPath) {
-    return path.join(contentPath, authorsMapPath);
-  }
-
-  return undefined;
-}
-
-export async function getAuthorsMap(
-  params: AuthorsMapParams,
-): Promise<AuthorsMap | undefined> {
-  const filePath = await getAuthorsMapFilePath(params);
-  if (!filePath) {
-    return undefined;
-  }
-  try {
-    return await readAuthorsMapFile(filePath);
-  } catch (e) {
-    // TODO replace later by error cause, see https://v8.dev/features/error-cause
-    logger.error`Couldn't read blog authors map at path=${filePath}`;
-    throw e;
-  }
 }
 
 type AuthorsParam = {

package/src/blogUtils.ts

@@ -28,6 +28,7 @@ import {
   Globby,
   normalizeFrontMatterTags,
   groupTaggedItems,
+  getContentPathList,
 } from '@docusaurus/utils';
 import {LoadContext} from '@docusaurus/types';
 import {validateBlogPostFrontMatter} from './blogFrontMatter';
@@ -318,8 +319,3 @@ export function linkify({
 
   return newContent;
 }
-
-// Order matters: we look in priority in localized folder
-export function getContentPathList(contentPaths: BlogContentPaths): string[] {
-  return [contentPaths.contentPathLocalized, contentPaths.contentPath];
-}

package/src/index.ts

@@ -16,6 +16,8 @@ import {
   posixPath,
   addTrailingPathSeparator,
   createAbsoluteFilePathMatcher,
+  getContentPathList,
+  getDataFilePath,
   DEFAULT_PLUGIN_ID,
 } from '@docusaurus/utils';
 import {translateContent, getTranslationFiles} from './translations';
@@ -45,13 +47,11 @@ import {
 import {Configuration} from 'webpack';
 import {
   generateBlogPosts,
-  getContentPathList,
   getSourceToPermalink,
   getBlogTags,
 } from './blogUtils';
 import {BlogPostFrontMatter} from './blogFrontMatter';
 import {createBlogFeedFiles} from './feed';
-import {getAuthorsMapFilePath} from './authors';
 
 export default async function pluginContentBlog(
   context: LoadContext,
@@ -90,8 +90,8 @@ export default async function pluginContentBlog(
   const aliasedSource = (source: string) =>
     `~blog/${posixPath(path.relative(pluginDataDirRoot, source))}`;
 
-  const authorsMapFilePath = await getAuthorsMapFilePath({
-    authorsMapPath: options.authorsMapPath,
+  const authorsMapFilePath = await getDataFilePath({
+    filePath: options.authorsMapPath,
     contentPaths,
   });