@astrojs/markdown-remark 1.2.0 → 2.0.0-beta.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/markdown-remark:build: cache hit, replaying output 968e841d80fa22fa
+@astrojs/markdown-remark:build: cache hit, replaying output 34663a00ad52a28a
 @astrojs/markdown-remark:build: 
-@astrojs/markdown-remark:build: > @astrojs/markdown-remark@1.2.0 build /home/runner/work/astro/astro/packages/markdown/remark
+@astrojs/markdown-remark:build: > @astrojs/markdown-remark@2.0.0-beta.0 build /home/runner/work/astro/astro/packages/markdown/remark
 @astrojs/markdown-remark:build: > astro-scripts build "src/**/*.ts" && tsc -p tsconfig.json
 @astrojs/markdown-remark:build: 

package/CHANGELOG.md

@@ -1,5 +1,105 @@
 # @astrojs/markdown-remark
 
+## 2.0.0-beta.0
+
+### Major Changes
+
+- [#5687](https://github.com/withastro/astro/pull/5687) [`e2019be6f`](https://github.com/withastro/astro/commit/e2019be6ffa46fa33d92cfd346f9ecbe51bb7144) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Give remark and rehype plugins access to user frontmatter via frontmatter injection. This means `data.astro.frontmatter` is now the _complete_ Markdown or MDX document's frontmatter, rather than an empty object.
+
+  This allows plugin authors to modify existing frontmatter, or compute new properties based on other properties. For example, say you want to compute a full image URL based on an `imageSrc` slug in your document frontmatter:
+
+  ```ts
+  export function remarkInjectSocialImagePlugin() {
+    return function (tree, file) {
+      const { frontmatter } = file.data.astro;
+      frontmatter.socialImageSrc = new URL(frontmatter.imageSrc, 'https://my-blog.com/').pathname;
+    };
+  }
+  ```
+
+  #### Content Collections - new `remarkPluginFrontmatter` property
+
+  We have changed _inject_ frontmatter to _modify_ frontmatter in our docs to improve discoverability. This is based on support forum feedback, where "injection" is rarely the term used.
+
+  To reflect this, the `injectedFrontmatter` property has been renamed to `remarkPluginFrontmatter`. This should clarify this plugin is still separate from the `data` export Content Collections expose today.
+
+  #### Migration instructions
+
+  Plugin authors should now **check for user frontmatter when applying defaults.**
+
+  For example, say a remark plugin wants to apply a default `title` if none is present. Add a conditional to check if the property is present, and update if none exists:
+
+  ```diff
+  export function remarkInjectTitlePlugin() {
+    return function (tree, file) {
+      const { frontmatter } = file.data.astro;
+  +    if (!frontmatter.title) {
+        frontmatter.title = 'Default title';
+  +    }
+    }
+  }
+  ```
+
+  This differs from previous behavior, where a Markdown file's frontmatter would _always_ override frontmatter injected via remark or reype.
+
+- [#5684](https://github.com/withastro/astro/pull/5684) [`a9c292026`](https://github.com/withastro/astro/commit/a9c2920264e36cc5dc05f4adc1912187979edb0d) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Refine Markdown and MDX configuration options for ease-of-use.
+
+  #### Markdown
+
+  - **Remove `remark-smartypants`** from Astro's default Markdown plugins.
+  - **Replace the `extendDefaultPlugins` option** with a simplified `gfm` boolean. This is enabled by default, and can be disabled to remove GitHub-Flavored Markdown.
+  - Ensure GitHub-Flavored Markdown is applied whether or not custom `remarkPlugins` or `rehypePlugins` are configured. If you want to apply custom plugins _and_ remove GFM, manually set `gfm: false` in your config.
+
+  #### MDX
+
+  - Support _all_ Markdown configuration options (except `drafts`) from your MDX integration config. This includes `syntaxHighlighting` and `shikiConfig` options to further customize the MDX renderer.
+  - Simplify `extendDefaults` to an `extendMarkdownConfig` option. MDX options will default to their equivalent in your Markdown config. By setting `extendMarkdownConfig` to false, you can "eject" to set your own syntax highlighting, plugins, and more.
+
+  #### Migration
+
+  To preserve your existing Markdown and MDX setup, you may need some configuration changes:
+
+  ##### Smartypants manual installation
+
+  [Smartypants](https://github.com/silvenon/remark-smartypants) has been removed from Astro's default setup. If you rely on this plugin, [install `remark-smartypants`](https://github.com/silvenon/remark-smartypants#installing) and apply to your `astro.config.*`:
+
+  ```diff
+  // astro.config.mjs
+  import { defineConfig } from 'astro/config';
+  + import smartypants from 'remark-smartypants';
+
+  export default defineConfig({
+    markdown: {
+  +   remarkPlugins: [smartypants],
+    }
+  });
+  ```
+
+  ##### Migrate `extendDefaultPlugins` to `gfm`
+
+  You may have disabled Astro's built-in plugins (GitHub-Flavored Markdown and Smartypants) with the `extendDefaultPlugins` option. Since Smartypants has been removed, this has been renamed to `gfm`.
+
+  ```diff
+  // astro.config.mjs
+  import { defineConfig } from 'astro/config';
+
+  export default defineConfig({
+    markdown: {
+  -   extendDefaultPlugins: false,
+  +   gfm: false,
+    }
+  });
+  ```
+
+  Additionally, applying remark and rehype plugins **no longer disables** `gfm`. You will need to opt-out manually by setting `gfm` to `false`.
+
+  ##### Migrate MDX's `extendPlugins` to `extendMarkdownConfig`
+
+  You may have used the `extendPlugins` option to manage plugin defaults in MDX. This has been replaced by 2 flags:
+
+  - `extendMarkdownConfig` (`true` by default) to toggle Markdown config inheritance. This replaces the `extendPlugins: 'markdown'` option.
+  - `gfm` (`true` by default) to toggle GitHub-Flavored Markdown in MDX. This replaces the `extendPlugins: 'defaults'` option.
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/frontmatter-injection.d.ts

@@ -0,0 +1,8 @@
+import type { Data, VFile } from 'vfile';
+import type { MarkdownAstroData } from './types.js';
+export declare class InvalidAstroDataError extends TypeError {
+}
+export declare function safelyGetAstroData(vfileData: Data): MarkdownAstroData | InvalidAstroDataError;
+export declare function toRemarkInitializeAstroData({ userFrontmatter, }: {
+    userFrontmatter: Record<string, any>;
+}): () => (tree: any, vfile: VFile) => void;

package/dist/frontmatter-injection.js

@@ -0,0 +1,35 @@
+function isValidAstroData(obj) {
+  if (typeof obj === "object" && obj !== null && obj.hasOwnProperty("frontmatter")) {
+    const { frontmatter } = obj;
+    try {
+      JSON.stringify(frontmatter);
+    } catch {
+      return false;
+    }
+    return typeof frontmatter === "object" && frontmatter !== null;
+  }
+  return false;
+}
+class InvalidAstroDataError extends TypeError {
+}
+function safelyGetAstroData(vfileData) {
+  const { astro } = vfileData;
+  if (!astro || !isValidAstroData(astro)) {
+    return new InvalidAstroDataError();
+  }
+  return astro;
+}
+function toRemarkInitializeAstroData({
+  userFrontmatter
+}) {
+  return () => function(tree, vfile) {
+    if (!vfile.data.astro) {
+      vfile.data.astro = { frontmatter: userFrontmatter };
+    }
+  };
+}
+export {
+  InvalidAstroDataError,
+  safelyGetAstroData,
+  toRemarkInitializeAstroData
+};

package/dist/index.d.ts

@@ -1,7 +1,6 @@
-import type { MarkdownRenderingOptions, MarkdownRenderingResult } from './types';
+import type { AstroMarkdownOptions, MarkdownRenderingOptions, MarkdownRenderingResult } from './types';
 export { rehypeHeadingIds } from './rehype-collect-headings.js';
 export * from './types.js';
-export declare const DEFAULT_REMARK_PLUGINS: string[];
-export declare const DEFAULT_REHYPE_PLUGINS: never[];
+export declare const markdownConfigDefaults: Omit<Required<AstroMarkdownOptions>, 'drafts'>;
 /** Shared utility for rendering markdown */
 export declare function renderMarkdown(content: string, opts: MarkdownRenderingOptions): Promise<MarkdownRenderingResult>;

package/dist/index.js

@@ -1,3 +1,4 @@
+import { toRemarkInitializeAstroData } from "./frontmatter-injection.js";
 import { loadPlugins } from "./load-plugins.js";
 import { rehypeHeadingIds } from "./rehype-collect-headings.js";
 import rehypeEscape from "./rehype-escape.js";
@@ -6,7 +7,6 @@ import rehypeIslands from "./rehype-islands.js";
 import rehypeJsx from "./rehype-jsx.js";
 import toRemarkContentRelImageError from "./remark-content-rel-image-error.js";
 import remarkEscape from "./remark-escape.js";
-import { remarkInitializeAstroData } from "./remark-initialize-astro-data.js";
 import remarkMarkAndUnravel from "./remark-mark-and-unravel.js";
 import remarkMdxish from "./remark-mdxish.js";
 import remarkPrism from "./remark-prism.js";
@@ -15,34 +15,45 @@ import remarkShiki from "./remark-shiki.js";
 import remarkUnwrap from "./remark-unwrap.js";
 import rehypeRaw from "rehype-raw";
 import rehypeStringify from "rehype-stringify";
+import remarkGfm from "remark-gfm";
 import markdown from "remark-parse";
 import markdownToHtml from "remark-rehype";
 import { unified } from "unified";
 import { VFile } from "vfile";
 import { rehypeHeadingIds as rehypeHeadingIds2 } from "./rehype-collect-headings.js";
 export * from "./types.js";
-const DEFAULT_REMARK_PLUGINS = ["remark-gfm", "remark-smartypants"];
-const DEFAULT_REHYPE_PLUGINS = [];
+const markdownConfigDefaults = {
+  syntaxHighlight: "shiki",
+  shikiConfig: {
+    langs: [],
+    theme: "github-dark",
+    wrap: false
+  },
+  remarkPlugins: [],
+  rehypePlugins: [],
+  remarkRehype: {},
+  gfm: true
+};
 async function renderMarkdown(content, opts) {
   var _a;
   let {
     fileURL,
-    syntaxHighlight = "shiki",
-    shikiConfig = {},
-    remarkPlugins = [],
-    rehypePlugins = [],
-    remarkRehype = {},
-    extendDefaultPlugins = false,
+    syntaxHighlight = markdownConfigDefaults.syntaxHighlight,
+    shikiConfig = markdownConfigDefaults.shikiConfig,
+    remarkPlugins = markdownConfigDefaults.remarkPlugins,
+    rehypePlugins = markdownConfigDefaults.rehypePlugins,
+    remarkRehype = markdownConfigDefaults.remarkRehype,
+    gfm = markdownConfigDefaults.gfm,
     isAstroFlavoredMd = false,
     isExperimentalContentCollections = false,
-    contentDir
+    contentDir,
+    frontmatter: userFrontmatter = {}
   } = opts;
   const input = new VFile({ value: content, path: fileURL });
   const scopedClassName = (_a = opts.$) == null ? void 0 : _a.scopedClassName;
-  let parser = unified().use(markdown).use(remarkInitializeAstroData).use(isAstroFlavoredMd ? [remarkMdxish, remarkMarkAndUnravel, remarkUnwrap, remarkEscape] : []);
-  if (extendDefaultPlugins || remarkPlugins.length === 0 && rehypePlugins.length === 0) {
-    remarkPlugins = [...DEFAULT_REMARK_PLUGINS, ...remarkPlugins];
-    rehypePlugins = [...DEFAULT_REHYPE_PLUGINS, ...rehypePlugins];
+  let parser = unified().use(markdown).use(toRemarkInitializeAstroData({ userFrontmatter })).use(isAstroFlavoredMd ? [remarkMdxish, remarkMarkAndUnravel, remarkUnwrap, remarkEscape] : []);
+  if (gfm) {
+    parser.use(remarkGfm);
   }
   const loadedRemarkPlugins = await Promise.all(loadPlugins(remarkPlugins));
   const loadedRehypePlugins = await Promise.all(loadPlugins(rehypePlugins));
@@ -115,8 +126,7 @@ ${err.message}`;
   return wrappedError;
 }
 export {
-  DEFAULT_REHYPE_PLUGINS,
-  DEFAULT_REMARK_PLUGINS,
+  markdownConfigDefaults,
   rehypeHeadingIds2 as rehypeHeadingIds,
   renderMarkdown
 };

package/dist/internal.d.ts

@@ -0,0 +1 @@
+export { InvalidAstroDataError, safelyGetAstroData, toRemarkInitializeAstroData, } from './frontmatter-injection.js';

package/dist/internal.js

@@ -0,0 +1,10 @@
+import {
+  InvalidAstroDataError,
+  safelyGetAstroData,
+  toRemarkInitializeAstroData
+} from "./frontmatter-injection.js";
+export {
+  InvalidAstroDataError,
+  safelyGetAstroData,
+  toRemarkInitializeAstroData
+};

package/dist/types.d.ts

@@ -5,14 +5,16 @@ import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki';
 import type * as unified from 'unified';
 import type { VFile } from 'vfile';
 export type { Node } from 'unist';
+export declare type MarkdownAstroData = {
+    frontmatter: Record<string, any>;
+};
 export declare type RemarkPlugin<PluginParameters extends any[] = any[]> = unified.Plugin<PluginParameters, mdast.Root>;
 export declare type RemarkPlugins = (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
 export declare type RehypePlugin<PluginParameters extends any[] = any[]> = unified.Plugin<PluginParameters, hast.Root>;
 export declare type RehypePlugins = (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
 export declare type RemarkRehype = Omit<RemarkRehypeOptions, 'handlers' | 'unknownHandler'> & {
-    handlers: typeof Handlers;
-} & {
-    handler: typeof Handler;
+    handlers?: typeof Handlers;
+    handler?: typeof Handler;
 };
 export interface ShikiConfig {
     langs?: ILanguageRegistration[];
@@ -20,14 +22,13 @@ export interface ShikiConfig {
     wrap?: boolean | null;
 }
 export interface AstroMarkdownOptions {
-    mode?: 'md' | 'mdx';
     drafts?: boolean;
     syntaxHighlight?: 'shiki' | 'prism' | false;
     shikiConfig?: ShikiConfig;
     remarkPlugins?: RemarkPlugins;
     rehypePlugins?: RehypePlugins;
     remarkRehype?: RemarkRehype;
-    extendDefaultPlugins?: boolean;
+    gfm?: boolean;
 }
 export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
     /** @internal */
@@ -41,6 +42,8 @@ export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
     isExperimentalContentCollections?: boolean;
     /** Used to prevent relative image imports from `src/content/` */
     contentDir: URL;
+    /** Used for frontmatter injection plugins */
+    frontmatter?: Record<string, any>;
 }
 export interface MarkdownHeading {
     depth: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "1.2.0",
+  "version": "2.0.0-beta.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -13,7 +13,8 @@
   "homepage": "https://astro.build",
   "main": "./dist/index.js",
   "exports": {
-    ".": "./dist/index.js"
+    ".": "./dist/index.js",
+    "./dist/internal.js": "./dist/internal.js"
   },
   "dependencies": {
     "@astrojs/micromark-extension-mdx-jsx": "^1.0.3",
@@ -34,7 +35,6 @@
     "remark-gfm": "^3.0.1",
     "remark-parse": "^10.0.1",
     "remark-rehype": "^10.1.0",
-    "remark-smartypants": "^2.0.0",
     "shiki": "^0.11.1",
     "unified": "^10.1.2",
     "unist-util-map": "^3.1.1",

package/src/frontmatter-injection.ts

@@ -0,0 +1,41 @@
+import type { Data, VFile } from 'vfile';
+import type { MarkdownAstroData } from './types.js';
+
+function isValidAstroData(obj: unknown): obj is MarkdownAstroData {
+	if (typeof obj === 'object' && obj !== null && obj.hasOwnProperty('frontmatter')) {
+		const { frontmatter } = obj as any;
+		try {
+			// ensure frontmatter is JSON-serializable
+			JSON.stringify(frontmatter);
+		} catch {
+			return false;
+		}
+		return typeof frontmatter === 'object' && frontmatter !== null;
+	}
+	return false;
+}
+
+export class InvalidAstroDataError extends TypeError {}
+
+export function safelyGetAstroData(vfileData: Data): MarkdownAstroData | InvalidAstroDataError {
+	const { astro } = vfileData;
+
+	if (!astro || !isValidAstroData(astro)) {
+		return new InvalidAstroDataError();
+	}
+
+	return astro;
+}
+
+export function toRemarkInitializeAstroData({
+	userFrontmatter,
+}: {
+	userFrontmatter: Record<string, any>;
+}) {
+	return () =>
+		function (tree: any, vfile: VFile) {
+			if (!vfile.data.astro) {
+				vfile.data.astro = { frontmatter: userFrontmatter };
+			}
+		};
+}

package/src/index.ts

@@ -1,5 +1,11 @@
-import type { MarkdownRenderingOptions, MarkdownRenderingResult, MarkdownVFile } from './types';
-
+import type {
+	AstroMarkdownOptions,
+	MarkdownRenderingOptions,
+	MarkdownRenderingResult,
+	MarkdownVFile,
+} from './types';
+
+import { toRemarkInitializeAstroData } from './frontmatter-injection.js';
 import { loadPlugins } from './load-plugins.js';
 import { rehypeHeadingIds } from './rehype-collect-headings.js';
 import rehypeEscape from './rehype-escape.js';
@@ -8,7 +14,6 @@ import rehypeIslands from './rehype-islands.js';
 import rehypeJsx from './rehype-jsx.js';
 import toRemarkContentRelImageError from './remark-content-rel-image-error.js';
 import remarkEscape from './remark-escape.js';
-import { remarkInitializeAstroData } from './remark-initialize-astro-data.js';
 import remarkMarkAndUnravel from './remark-mark-and-unravel.js';
 import remarkMdxish from './remark-mdxish.js';
 import remarkPrism from './remark-prism.js';
@@ -18,6 +23,7 @@ import remarkUnwrap from './remark-unwrap.js';
 
 import rehypeRaw from 'rehype-raw';
 import rehypeStringify from 'rehype-stringify';
+import remarkGfm from 'remark-gfm';
 import markdown from 'remark-parse';
 import markdownToHtml from 'remark-rehype';
 import { unified } from 'unified';
@@ -26,8 +32,18 @@ import { VFile } from 'vfile';
 export { rehypeHeadingIds } from './rehype-collect-headings.js';
 export * from './types.js';
 
-export const DEFAULT_REMARK_PLUGINS = ['remark-gfm', 'remark-smartypants'];
-export const DEFAULT_REHYPE_PLUGINS = [];
+export const markdownConfigDefaults: Omit<Required<AstroMarkdownOptions>, 'drafts'> = {
+	syntaxHighlight: 'shiki',
+	shikiConfig: {
+		langs: [],
+		theme: 'github-dark',
+		wrap: false,
+	},
+	remarkPlugins: [],
+	rehypePlugins: [],
+	remarkRehype: {},
+	gfm: true,
+};
 
 /** Shared utility for rendering markdown */
 export async function renderMarkdown(
@@ -36,27 +52,27 @@ export async function renderMarkdown(
 ): Promise<MarkdownRenderingResult> {
 	let {
 		fileURL,
-		syntaxHighlight = 'shiki',
-		shikiConfig = {},
-		remarkPlugins = [],
-		rehypePlugins = [],
-		remarkRehype = {},
-		extendDefaultPlugins = false,
+		syntaxHighlight = markdownConfigDefaults.syntaxHighlight,
+		shikiConfig = markdownConfigDefaults.shikiConfig,
+		remarkPlugins = markdownConfigDefaults.remarkPlugins,
+		rehypePlugins = markdownConfigDefaults.rehypePlugins,
+		remarkRehype = markdownConfigDefaults.remarkRehype,
+		gfm = markdownConfigDefaults.gfm,
 		isAstroFlavoredMd = false,
 		isExperimentalContentCollections = false,
 		contentDir,
+		frontmatter: userFrontmatter = {},
 	} = opts;
 	const input = new VFile({ value: content, path: fileURL });
 	const scopedClassName = opts.$?.scopedClassName;
 
 	let parser = unified()
 		.use(markdown)
-		.use(remarkInitializeAstroData)
+		.use(toRemarkInitializeAstroData({ userFrontmatter }))
 		.use(isAstroFlavoredMd ? [remarkMdxish, remarkMarkAndUnravel, remarkUnwrap, remarkEscape] : []);
 
-	if (extendDefaultPlugins || (remarkPlugins.length === 0 && rehypePlugins.length === 0)) {
-		remarkPlugins = [...DEFAULT_REMARK_PLUGINS, ...remarkPlugins];
-		rehypePlugins = [...DEFAULT_REHYPE_PLUGINS, ...rehypePlugins];
+	if (gfm) {
+		parser.use(remarkGfm);
 	}
 
 	const loadedRemarkPlugins = await Promise.all(loadPlugins(remarkPlugins));

package/src/internal.ts

@@ -0,0 +1,5 @@
+export {
+	InvalidAstroDataError,
+	safelyGetAstroData,
+	toRemarkInitializeAstroData,
+} from './frontmatter-injection.js';

package/src/types.ts

@@ -11,6 +11,10 @@ import type { VFile } from 'vfile';
 
 export type { Node } from 'unist';
 
+export type MarkdownAstroData = {
+	frontmatter: Record<string, any>;
+};
+
 export type RemarkPlugin<PluginParameters extends any[] = any[]> = unified.Plugin<
 	PluginParameters,
 	mdast.Root
@@ -26,8 +30,9 @@ export type RehypePlugin<PluginParameters extends any[] = any[]> = unified.Plugi
 export type RehypePlugins = (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
 
 export type RemarkRehype = Omit<RemarkRehypeOptions, 'handlers' | 'unknownHandler'> & {
-	handlers: typeof Handlers;
-} & { handler: typeof Handler };
+	handlers?: typeof Handlers;
+	handler?: typeof Handler;
+};
 
 export interface ShikiConfig {
 	langs?: ILanguageRegistration[];
@@ -36,14 +41,13 @@ export interface ShikiConfig {
 }
 
 export interface AstroMarkdownOptions {
-	mode?: 'md' | 'mdx';
 	drafts?: boolean;
 	syntaxHighlight?: 'shiki' | 'prism' | false;
 	shikiConfig?: ShikiConfig;
 	remarkPlugins?: RemarkPlugins;
 	rehypePlugins?: RehypePlugins;
 	remarkRehype?: RemarkRehype;
-	extendDefaultPlugins?: boolean;
+	gfm?: boolean;
 }
 
 export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
@@ -58,6 +62,8 @@ export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
 	isExperimentalContentCollections?: boolean;
 	/** Used to prevent relative image imports from `src/content/` */
 	contentDir: URL;
+	/** Used for frontmatter injection plugins */
+	frontmatter?: Record<string, any>;
 }
 
 export interface MarkdownHeading {

package/dist/remark-initialize-astro-data.d.ts

@@ -1,2 +0,0 @@
-import type { VFile } from 'vfile';
-export declare function remarkInitializeAstroData(): (tree: any, vfile: VFile) => void;

package/dist/remark-initialize-astro-data.js

@@ -1,10 +0,0 @@
-function remarkInitializeAstroData() {
-  return function(tree, vfile) {
-    if (!vfile.data.astro) {
-      vfile.data.astro = { frontmatter: {} };
-    }
-  };
-}
-export {
-  remarkInitializeAstroData
-};

package/src/remark-initialize-astro-data.ts

@@ -1,9 +0,0 @@
-import type { VFile } from 'vfile';
-
-export function remarkInitializeAstroData() {
-	return function (tree: any, vfile: VFile) {
-		if (!vfile.data.astro) {
-			vfile.data.astro = { frontmatter: {} };
-		}
-	};
-}