@analogjs/content 3.0.0-alpha.1 → 3.0.0-alpha.11

package/fesm2022/analogjs-content-prism-highlighter.mjs

@@ -1,27 +1,25 @@
-import { MarkedContentHighlighter, NoopContentRenderer, ContentRenderer } from '@analogjs/content';
-import * as i0 from '@angular/core';
-import { Injectable } from '@angular/core';
-import { markedHighlight } from 'marked-highlight';
-import 'prismjs';
-import 'prismjs/plugins/toolbar/prism-toolbar';
-import 'prismjs/plugins/copy-to-clipboard/prism-copy-to-clipboard';
-
-class PrismHighlighter extends MarkedContentHighlighter {
-    augmentCodeBlock(code, lang) {
-        const classes = lang.startsWith('diff') && Prism.languages['diff']
-            ? `language-${lang} diff-highlight`
-            : `language-${lang.replace('diff-', '')}`;
-        return `<pre class="${classes}"><code class="${classes}">${code}</code></pre>`;
-    }
-    getHighlightExtension() {
-        return markedHighlight({
-            async: true,
-            highlight: (code, lang) => {
-                let diff = lang?.startsWith('diff-');
-                lang = diff ? lang.replace('diff-', '') : lang || 'typescript';
-                if (diff && !Prism.languages['diff']) {
-                    diff = false;
-                    console.warn(`Notice:
+import * as i0 from "@angular/core";
+import { Injectable } from "@angular/core";
+import { ContentRenderer, MarkedContentHighlighter, NoopContentRenderer } from "@analogjs/content";
+import { markedHighlight } from "marked-highlight";
+import Prism$1 from "prismjs";
+import "prismjs/plugins/toolbar/prism-toolbar";
+import "prismjs/plugins/copy-to-clipboard/prism-copy-to-clipboard";
+//#region packages/content/prism-highlighter/src/lib/prism-highlighter.ts
+var PrismHighlighter = class PrismHighlighter extends MarkedContentHighlighter {
+	augmentCodeBlock(code, lang) {
+		const classes = lang.startsWith("diff") && Prism.languages["diff"] ? `language-${lang} diff-highlight` : `language-${lang.replace("diff-", "")}`;
+		return `<pre class="${classes}"><code class="${classes}">${code}</code></pre>`;
+	}
+	getHighlightExtension() {
+		return markedHighlight({
+			async: true,
+			highlight: (code, lang) => {
+				let diff = lang?.startsWith("diff-");
+				lang = diff ? lang.replace("diff-", "") : lang || "typescript";
+				if (diff && !Prism.languages["diff"]) {
+					diff = false;
+					console.warn(`Notice:
     ---------------------------------------------------------------------------------------
     The \`diff\` language and plugin are not available in the provided setup.
     To enable it, add the following imports your \`app.config.ts\`:
@@ -29,57 +27,72 @@ class PrismHighlighter extends MarkedContentHighlighter {
       import 'prismjs/plugins/diff-highlight/prism-diff-highlight';
     ---------------------------------------------------------------------------------------
             `);
-                }
-                if (!Prism.languages[lang]) {
-                    if (lang !== 'mermaid') {
-                        console.warn(`Notice:
+				}
+				if (!Prism.languages[lang]) {
+					if (lang !== "mermaid") console.warn(`Notice:
     ---------------------------------------------------------------------------------------
     The requested language '${lang}' is not available in the provided setup.
     To enable it, add the following import your \`app.config.ts\`:
       import 'prismjs/components/prism-${lang}';
     ---------------------------------------------------------------------------------------
               `);
-                    }
-                    return code;
-                }
-                return Prism.highlight(code, diff ? Prism.languages['diff'] : Prism.languages[lang], lang);
-            },
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.1", ngImport: i0, type: PrismHighlighter, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.1", ngImport: i0, type: PrismHighlighter }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.1", ngImport: i0, type: PrismHighlighter, decorators: [{
-            type: Injectable
-        }] });
-
-"use strict";
-(function () {
-    if (typeof Prism === 'undefined') {
-        return;
-    }
-    Prism.languages.angular = Prism.languages.extend('markup', {
-        keyword: /(?:@if|@for|@switch|@defer|@loading|@error|@placeholder|prefetch)\b/,
-        operator: /\b(?:on|when)\b/,
-        number: {
-            pattern: /\b(minimum|after)\s+\d+(?:s|ms|)/gi,
-            lookbehind: true,
-        },
-        builtin: {
-            pattern: /\b(?:viewport|timer|minimum|after|hover|idle|immediate|interaction)/,
-        },
-        function: /#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/,
-    });
-    Prism.languages.ng = Prism.languages.angular;
+					return code;
+				}
+				return Prism.highlight(code, diff ? Prism.languages["diff"] : Prism.languages[lang], lang);
+			}
+		});
+	}
+	static {
+		this.ɵfac = i0.ɵɵngDeclareFactory({
+			minVersion: "12.0.0",
+			version: "21.1.1",
+			ngImport: i0,
+			type: PrismHighlighter,
+			deps: null,
+			target: i0.ɵɵFactoryTarget.Injectable
+		});
+	}
+	static {
+		this.ɵprov = i0.ɵɵngDeclareInjectable({
+			minVersion: "12.0.0",
+			version: "21.1.1",
+			ngImport: i0,
+			type: PrismHighlighter
+		});
+	}
+};
+i0.ɵɵngDeclareClassMetadata({
+	minVersion: "12.0.0",
+	version: "21.1.1",
+	ngImport: i0,
+	type: PrismHighlighter,
+	decorators: [{ type: Injectable }]
+});
+//#endregion
+//#region packages/content/prism-highlighter/src/lib/prism/angular.ts
+(function() {
+	if (typeof Prism$1 === "undefined") return;
+	Prism$1.languages["angular"] = Prism$1.languages.extend("markup", {
+		keyword: /(?:@if|@for|@switch|@defer|@loading|@error|@placeholder|prefetch)\b/,
+		operator: /\b(?:on|when)\b/,
+		number: {
+			pattern: /\b(minimum|after)\s+\d+(?:s|ms|)/gi,
+			lookbehind: true
+		},
+		builtin: { pattern: /\b(?:viewport|timer|minimum|after|hover|idle|immediate|interaction)/ },
+		function: /#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/
+	});
+	Prism$1.languages["ng"] = Prism$1.languages["angular"];
 })();
-
+//#endregion
+//#region packages/content/prism-highlighter/src/index.ts
 function withPrismHighlighter() {
-    return [{ provide: ContentRenderer, useClass: NoopContentRenderer }];
+	return [{
+		provide: ContentRenderer,
+		useClass: NoopContentRenderer
+	}];
 }
-
-/**
- * Generated bundle index. Do not edit.
- */
-
+//#endregion
 export { PrismHighlighter, withPrismHighlighter };
-//# sourceMappingURL=analogjs-content-prism-highlighter.mjs.map
+
+//# sourceMappingURL=analogjs-content-prism-highlighter.mjs.map

package/fesm2022/analogjs-content-resources.mjs

@@ -1,129 +1,120 @@
-import { resource, inject, computed } from '@angular/core';
-import { injectContentListLoader, parseRawContentFile, injectContentFileLoader, ContentRenderer } from '@analogjs/content';
-import { ActivatedRoute } from '@angular/router';
-import { toSignal } from '@angular/core/rxjs-interop';
-import { from } from 'rxjs';
-import { map } from 'rxjs/operators';
-
+import { computed, inject, resource } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { from } from "rxjs";
+import { map } from "rxjs/operators";
+import { toSignal } from "@angular/core/rxjs-interop";
+import { ContentRenderer, FrontmatterValidationError, injectContentFileLoader, injectContentListLoader, parseRawContentFile, parseRawContentFileAsync } from "@analogjs/content";
+//#region packages/content/resources/src/content-files-resource.ts
 function contentFilesResource(filterFn) {
-    const contentListLoader = injectContentListLoader();
-    const contentList = contentListLoader().then((items) => filterFn ? items.filter(filterFn) : items);
-    return resource({
-        loader: () => contentList,
-    });
+	const contentList = injectContentListLoader()().then((items) => filterFn ? items.filter(filterFn) : items);
+	return resource({ loader: () => contentList });
 }
-
-async function getContentFile(contentFiles, slug, fallback) {
-    // Normalize file keys so both "/src/content/..." and "/<project>/src/content/..." resolve.
-    // This mirrors normalization used elsewhere in the content pipeline.
-    const normalizedFiles = {};
-    for (const [key, resolver] of Object.entries(contentFiles)) {
-        const normalizedKey = key
-            // replace any prefix up to the content directory with /src/content
-            // use a non-greedy match so nested paths containing "/content" are preserved
-            .replace(/^(?:.*?)\/content(?=\/)/, '/src/content')
-            // normalize duplicate slashes
-            .replace(/\/{2,}/g, '/');
-        normalizedFiles[normalizedKey] = resolver;
-    }
-    // Try direct file first, then directory index variants
-    const base = `/src/content/${slug}`.replace(/\/{2,}/g, '/');
-    const candidates = [
-        `${base}.md`,
-        `${base}.agx`,
-        `${base}/index.md`,
-        `${base}/index.agx`,
-    ];
-    const matchKey = candidates.find((k) => k in normalizedFiles);
-    const contentFile = matchKey ? normalizedFiles[matchKey] : undefined;
-    if (!contentFile) {
-        return {
-            filename: base,
-            attributes: {},
-            slug: '',
-            content: fallback,
-        };
-    }
-    const resolvedBase = matchKey.replace(/\.(md|agx)$/, '');
-    return contentFile().then((contentFile) => {
-        if (typeof contentFile === 'string') {
-            const { content, attributes } = parseRawContentFile(contentFile);
-            return {
-                filename: resolvedBase,
-                slug,
-                attributes,
-                content,
-            };
-        }
-        return {
-            filename: resolvedBase,
-            slug,
-            attributes: contentFile.metadata,
-            content: contentFile.default,
-        };
-    });
+//#endregion
+//#region packages/content/resources/src/content-file-resource.ts
+async function validateAttributes(schema, attributes, filename) {
+	const result = await schema["~standard"].validate(attributes);
+	if (result.issues) throw new FrontmatterValidationError(result.issues, filename);
+	return result.value;
 }
-/**
- * Resource for requesting an individual content file
- *
- * @param params
- * @param fallback
- * @returns
- */
-function contentFileResource(params, fallback = 'No Content Found') {
-    const loaderPromise = injectContentFileLoader();
-    const contentRenderer = inject(ContentRenderer);
-    const contentFilesMap = toSignal(from(loaderPromise()));
-    const input = params ||
-        toSignal(inject(ActivatedRoute).paramMap.pipe(map((params) => params.get('slug'))), { requireSync: true });
-    return resource({
-        params: computed(() => ({ input: input(), files: contentFilesMap() })),
-        loader: async ({ params }) => {
-            const { input: param, files } = params;
-            if (typeof param === 'string') {
-                if (param) {
-                    const file = await getContentFile(files, param, fallback);
-                    if (typeof file.content === 'string') {
-                        const rendered = (await contentRenderer.render(file.content));
-                        return {
-                            ...file,
-                            toc: rendered.toc ?? [],
-                        };
-                    }
-                    return {
-                        ...file,
-                        toc: [],
-                    };
-                }
-                return {
-                    filename: '',
-                    slug: '',
-                    attributes: {},
-                    content: fallback,
-                    toc: [],
-                };
-            }
-            else {
-                const file = await getContentFile(files, param.customFilename, fallback);
-                if (typeof file.content === 'string') {
-                    const rendered = (await contentRenderer.render(file.content));
-                    return {
-                        ...file,
-                        toc: rendered.toc ?? [],
-                    };
-                }
-                return {
-                    ...file,
-                    toc: [],
-                };
-            }
-        },
-    });
+function getValidationFilename(filename) {
+	return filename.replace(/^\/src\/content\//, "");
 }
-
-/**
- * Generated bundle index. Do not edit.
- */
-
+async function getContentFile(contentFiles, slug, fallback, schema) {
+	const normalizedFiles = {};
+	for (const [key, resolver] of Object.entries(contentFiles)) {
+		const normalizedKey = key.replace(/^(?:.*?)\/content(?=\/)/, "/src/content").replace(/\/{2,}/g, "/");
+		normalizedFiles[normalizedKey] = resolver;
+	}
+	const base = `/src/content/${slug}`.replace(/\/{2,}/g, "/");
+	const matchKey = [
+		`${base}.md`,
+		`${base}.agx`,
+		`${base}/index.md`,
+		`${base}/index.agx`
+	].find((k) => k in normalizedFiles);
+	const contentFile = matchKey ? normalizedFiles[matchKey] : void 0;
+	if (!contentFile) return {
+		filename: base,
+		attributes: {},
+		slug: "",
+		content: fallback
+	};
+	const resolvedBase = matchKey.replace(/\.(md|agx)$/, "");
+	const validationFilename = getValidationFilename(matchKey);
+	return contentFile().then(async (contentFile) => {
+		if (typeof contentFile === "string") {
+			const { content, attributes } = schema ? await parseRawContentFileAsync(contentFile, schema, validationFilename) : parseRawContentFile(contentFile);
+			return {
+				filename: resolvedBase,
+				slug,
+				attributes,
+				content
+			};
+		}
+		return {
+			filename: resolvedBase,
+			slug,
+			attributes: schema ? await validateAttributes(schema, contentFile.metadata, validationFilename) : contentFile.metadata,
+			content: contentFile.default
+		};
+	});
+}
+function contentFileResource(paramsOrOptions, fallbackArg = "No Content Found") {
+	const isOptionsObject = paramsOrOptions && typeof paramsOrOptions === "object" && !("set" in paramsOrOptions) && ("schema" in paramsOrOptions || "params" in paramsOrOptions || "fallback" in paramsOrOptions);
+	const params = isOptionsObject ? paramsOrOptions.params : paramsOrOptions;
+	const fallback = isOptionsObject ? paramsOrOptions.fallback ?? "No Content Found" : fallbackArg;
+	const schema = isOptionsObject ? paramsOrOptions.schema : void 0;
+	const loaderPromise = injectContentFileLoader();
+	const contentRenderer = inject(ContentRenderer);
+	const contentFilesMap = toSignal(from(loaderPromise()));
+	const input = params || toSignal(inject(ActivatedRoute).paramMap.pipe(map((params) => params.get("slug"))), { requireSync: true });
+	return resource({
+		params: computed(() => ({
+			input: input(),
+			files: contentFilesMap()
+		})),
+		loader: async ({ params: resourceParams }) => {
+			const { input: param, files } = resourceParams;
+			if (typeof param === "string") {
+				if (param) {
+					const file = await getContentFile(files, param, fallback, schema);
+					if (typeof file.content === "string") {
+						const rendered = await contentRenderer.render(file.content);
+						return {
+							...file,
+							toc: rendered.toc ?? []
+						};
+					}
+					return {
+						...file,
+						toc: []
+					};
+				}
+				return {
+					filename: "",
+					slug: "",
+					attributes: {},
+					content: fallback,
+					toc: []
+				};
+			} else {
+				const file = await getContentFile(files, param.customFilename, fallback, schema);
+				if (typeof file.content === "string") {
+					const rendered = await contentRenderer.render(file.content);
+					return {
+						...file,
+						toc: rendered.toc ?? []
+					};
+				}
+				return {
+					...file,
+					toc: []
+				};
+			}
+		}
+	});
+}
+//#endregion
 export { contentFileResource, contentFilesResource };
-//# sourceMappingURL=analogjs-content-resources.mjs.map
+
+//# sourceMappingURL=analogjs-content-resources.mjs.map

package/fesm2022/analogjs-content-shiki-highlighter.mjs

@@ -1,17 +1,12 @@
-import { NoopContentRenderer, ContentRenderer } from '@analogjs/content';
-
+import { ContentRenderer, NoopContentRenderer } from "@analogjs/content";
+//#region packages/content/shiki-highlighter/src/index.ts
 function withShikiHighlighter(_opts = {}) {
-    return [
-        {
-            provide: ContentRenderer,
-            useClass: NoopContentRenderer,
-        },
-    ];
+	return [{
+		provide: ContentRenderer,
+		useClass: NoopContentRenderer
+	}];
 }
-
-/**
- * Generated bundle index. Do not edit.
- */
-
+//#endregion
 export { withShikiHighlighter };
-//# sourceMappingURL=analogjs-content-shiki-highlighter.mjs.map
+
+//# sourceMappingURL=analogjs-content-shiki-highlighter.mjs.map