@docusaurus/plugin-content-blog 0.0.0-4751 → 0.0.0-4754

package/lib/blogUtils.js

@@ -13,7 +13,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const reading_time_1 = tslib_1.__importDefault(require("reading-time"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
-const blogFrontMatter_1 = require("./blogFrontMatter");
+const frontMatter_1 = require("./frontMatter");
 const authors_1 = require("./authors");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 function truncate(fileString, truncateMarker) {
@@ -107,7 +107,7 @@ async function parseBlogPostMarkdownFile(blogSourceAbsolute) {
         });
         return {
             ...result,
-            frontMatter: (0, blogFrontMatter_1.validateBlogPostFrontMatter)(result.frontMatter),
+            frontMatter: (0, frontMatter_1.validateBlogPostFrontMatter)(result.frontMatter),
         };
     }
     catch (err) {

package/lib/index.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { BlogContent } from './types';
-import type { LoadContext, Plugin, OptionValidationContext, ValidationResult } from '@docusaurus/types';
+import type { LoadContext, Plugin } from '@docusaurus/types';
 import type { PluginOptions } from '@docusaurus/plugin-content-blog';
 export default function pluginContentBlog(context: LoadContext, options: PluginOptions): Promise<Plugin<BlogContent>>;
-export declare function validateOptions({ validate, options, }: OptionValidationContext<PluginOptions>): ValidationResult<PluginOptions>;
+export { validateOptions } from './options';

package/lib/index.js

@@ -12,7 +12,6 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const remark_admonitions_1 = tslib_1.__importDefault(require("remark-admonitions"));
 const utils_1 = require("@docusaurus/utils");
 const translations_1 = require("./translations");
-const pluginOptionSchema_1 = require("./pluginOptionSchema");
 const blogUtils_1 = require("./blogUtils");
 const feed_1 = require("./feed");
 async function pluginContentBlog(context, options) {
@@ -382,8 +381,5 @@ async function pluginContentBlog(context, options) {
     };
 }
 exports.default = pluginContentBlog;
-function validateOptions({ validate, options, }) {
-    const validatedOptions = validate(pluginOptionSchema_1.PluginOptionSchema, options);
-    return validatedOptions;
-}
-exports.validateOptions = validateOptions;
+var options_1 = require("./options");
+Object.defineProperty(exports, "validateOptions", { enumerable: true, get: function () { return options_1.validateOptions; } });

package/lib/options.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import type { PluginOptions, Options } from '@docusaurus/plugin-content-blog';
+import type { OptionValidationContext } from '@docusaurus/types';
+export declare const DEFAULT_OPTIONS: PluginOptions;
+export declare function validateOptions({ validate, options, }: OptionValidationContext<Options, PluginOptions>): PluginOptions;

package/lib/{pluginOptionSchema.js → options.js}

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PluginOptionSchema = exports.DEFAULT_OPTIONS = void 0;
+exports.validateOptions = exports.DEFAULT_OPTIONS = void 0;
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const utils_1 = require("@docusaurus/utils");
 exports.DEFAULT_OPTIONS = {
@@ -39,7 +39,7 @@ exports.DEFAULT_OPTIONS = {
     readingTime: ({ content, defaultReadingTime }) => defaultReadingTime({ content }),
     sortPosts: 'descending',
 };
-exports.PluginOptionSchema = utils_validation_1.Joi.object({
+const PluginOptionSchema = utils_validation_1.Joi.object({
     path: utils_validation_1.Joi.string().default(exports.DEFAULT_OPTIONS.path),
     archiveBasePath: utils_validation_1.Joi.string()
         .default(exports.DEFAULT_OPTIONS.archiveBasePath)
@@ -100,4 +100,9 @@ exports.PluginOptionSchema = utils_validation_1.Joi.object({
     sortPosts: utils_validation_1.Joi.string()
         .valid('descending', 'ascending')
         .default(exports.DEFAULT_OPTIONS.sortPosts),
-});
+}).default(exports.DEFAULT_OPTIONS);
+function validateOptions({ validate, options, }) {
+    const validatedOptions = validate(PluginOptionSchema, options);
+    return validatedOptions;
+}
+exports.validateOptions = validateOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "0.0.0-4751",
+  "version": "0.0.0-4754",
   "description": "Blog plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-blog.d.ts",
@@ -18,12 +18,12 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4751",
-    "@docusaurus/logger": "0.0.0-4751",
-    "@docusaurus/mdx-loader": "0.0.0-4751",
-    "@docusaurus/utils": "0.0.0-4751",
-    "@docusaurus/utils-common": "0.0.0-4751",
-    "@docusaurus/utils-validation": "0.0.0-4751",
+    "@docusaurus/core": "0.0.0-4754",
+    "@docusaurus/logger": "0.0.0-4754",
+    "@docusaurus/mdx-loader": "0.0.0-4754",
+    "@docusaurus/utils": "0.0.0-4754",
+    "@docusaurus/utils-common": "0.0.0-4754",
+    "@docusaurus/utils-validation": "0.0.0-4754",
     "cheerio": "^1.0.0-rc.10",
     "feed": "^4.2.2",
     "fs-extra": "^10.0.1",
@@ -35,7 +35,7 @@
     "webpack": "^5.70.0"
   },
   "devDependencies": {
-    "@docusaurus/types": "0.0.0-4751",
+    "@docusaurus/types": "0.0.0-4754",
     "escape-string-regexp": "^4.0.0"
   },
   "peerDependencies": {
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "31dce3a6b7ba78c70754f80693c87a706d47500f"
+  "gitHead": "6c1c0d9bb0878c738732b8678af70a8dc04ee0a4"
 }

package/src/blogUtils.ts

@@ -31,7 +31,7 @@ import {
   getContentPathList,
 } from '@docusaurus/utils';
 import type {LoadContext} from '@docusaurus/types';
-import {validateBlogPostFrontMatter} from './blogFrontMatter';
+import {validateBlogPostFrontMatter} from './frontMatter';
 import {type AuthorsMap, getAuthorsMap, getBlogPostAuthors} from './authors';
 import logger from '@docusaurus/logger';
 import type {

package/src/index.ts

@@ -30,14 +30,7 @@ import type {
   BlogContentPaths,
   BlogMarkdownLoaderOptions,
 } from './types';
-import {PluginOptionSchema} from './pluginOptionSchema';
-import type {
-  LoadContext,
-  Plugin,
-  HtmlTags,
-  OptionValidationContext,
-  ValidationResult,
-} from '@docusaurus/types';
+import type {LoadContext, Plugin, HtmlTags} from '@docusaurus/types';
 import {
   generateBlogPosts,
   getSourceToPermalink,
@@ -572,10 +565,4 @@ export default async function pluginContentBlog(
   };
 }
 
-export function validateOptions({
-  validate,
-  options,
-}: OptionValidationContext<PluginOptions>): ValidationResult<PluginOptions> {
-  const validatedOptions = validate(PluginOptionSchema, options);
-  return validatedOptions;
-}
+export {validateOptions} from './options';

package/src/{pluginOptionSchema.ts → options.ts}

@@ -13,7 +13,8 @@ import {
   URISchema,
 } from '@docusaurus/utils-validation';
 import {GlobExcludeDefault} from '@docusaurus/utils';
-import type {PluginOptions} from '@docusaurus/plugin-content-blog';
+import type {PluginOptions, Options} from '@docusaurus/plugin-content-blog';
+import type {OptionValidationContext} from '@docusaurus/types';
 
 export const DEFAULT_OPTIONS: PluginOptions = {
   feedOptions: {type: ['rss', 'atom'], copyright: ''},
@@ -46,7 +47,7 @@ export const DEFAULT_OPTIONS: PluginOptions = {
   sortPosts: 'descending',
 };
 
-export const PluginOptionSchema = Joi.object<PluginOptions>({
+const PluginOptionSchema = Joi.object<PluginOptions>({
   path: Joi.string().default(DEFAULT_OPTIONS.path),
   archiveBasePath: Joi.string()
     .default(DEFAULT_OPTIONS.archiveBasePath)
@@ -125,4 +126,15 @@ export const PluginOptionSchema = Joi.object<PluginOptions>({
   sortPosts: Joi.string()
     .valid('descending', 'ascending')
     .default(DEFAULT_OPTIONS.sortPosts),
-});
+}).default(DEFAULT_OPTIONS);
+
+export function validateOptions({
+  validate,
+  options,
+}: OptionValidationContext<Options, PluginOptions>): PluginOptions {
+  const validatedOptions = validate(
+    PluginOptionSchema,
+    options,
+  ) as PluginOptions;
+  return validatedOptions;
+}

package/lib/pluginOptionSchema.d.ts

@@ -1,10 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import { Joi } from '@docusaurus/utils-validation';
-import type { PluginOptions } from '@docusaurus/plugin-content-blog';
-export declare const DEFAULT_OPTIONS: PluginOptions;
-export declare const PluginOptionSchema: Joi.ObjectSchema<PluginOptions>;