@analogjs/content 3.0.0-alpha.9 → 3.0.0-alpha.90

package/fesm2022/analogjs-content-resources.mjs

@@ -1,29 +1,44 @@
+import { t as ContentRenderer } from "./content-renderer.mjs";
+import { a as injectContentFileLoader, f as filterByLocale, n as injectContentListLoader, p as injectContentLocale } from "./content-list-loader.mjs";
+import { n as parseRawContentFile, r as parseRawContentFileAsync, t as FrontmatterValidationError } from "./parse-raw-content-file.mjs";
 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, injectContentFileLoader, injectContentListLoader, parseRawContentFile } from "@analogjs/content";
 //#region packages/content/resources/src/content-files-resource.ts
 function contentFilesResource(filterFn) {
-	const contentList = injectContentListLoader()().then((items) => filterFn ? items.filter(filterFn) : items);
+	const contentListLoader = injectContentListLoader();
+	const locale = injectContentLocale();
+	const contentList = contentListLoader().then((items) => {
+		let results = locale ? filterByLocale(items, locale) : items;
+		if (filterFn) results = results.filter(filterFn);
+		return results;
+	});
 	return resource({ loader: () => contentList });
 }
 //#endregion
 //#region packages/content/resources/src/content-file-resource.ts
-async function getContentFile(contentFiles, slug, fallback) {
+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;
+}
+function getValidationFilename(filename) {
+	return filename.replace(/^\/src\/content\//, "");
+}
+async function getContentFile(contentFiles, slug, fallback, locale, schema) {
 	const normalizedFiles = {};
+	const stemToKey = {};
 	for (const [key, resolver] of Object.entries(contentFiles)) {
 		const normalizedKey = key.replace(/^(?:.*?)\/content(?=\/)/, "/src/content").replace(/\/{2,}/g, "/");
 		normalizedFiles[normalizedKey] = resolver;
+		const stem = normalizedKey.split("/").pop()?.replace(/\.[^.]+$/, "");
+		if (stem && !stemToKey[stem]) stemToKey[stem] = normalizedKey;
 	}
 	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 candidates = [`${base}.md`, `${base}/index.md`];
+	const matchKey = [...locale ? candidates.map((c) => c.replace("/src/content/", `/src/content/${locale}/`)) : [], ...candidates].find((k) => k in normalizedFiles) ?? stemToKey[slug];
 	const contentFile = matchKey ? normalizedFiles[matchKey] : void 0;
 	if (!contentFile) return {
 		filename: base,
@@ -31,10 +46,11 @@ async function getContentFile(contentFiles, slug, fallback) {
 		slug: "",
 		content: fallback
 	};
-	const resolvedBase = matchKey.replace(/\.(md|agx)$/, "");
-	return contentFile().then((contentFile) => {
+	const resolvedBase = matchKey.replace(/\.md$/, "");
+	const validationFilename = getValidationFilename(matchKey);
+	return contentFile().then(async (contentFile) => {
 		if (typeof contentFile === "string") {
-			const { content, attributes } = parseRawContentFile(contentFile);
+			const { content, attributes } = schema ? await parseRawContentFileAsync(contentFile, schema, validationFilename) : parseRawContentFile(contentFile);
 			return {
 				filename: resolvedBase,
 				slug,
@@ -45,21 +61,19 @@ async function getContentFile(contentFiles, slug, fallback) {
 		return {
 			filename: resolvedBase,
 			slug,
-			attributes: contentFile.metadata,
+			attributes: schema ? await validateAttributes(schema, contentFile.metadata, validationFilename) : contentFile.metadata,
 			content: contentFile.default
 		};
 	});
 }
-/**
-* Resource for requesting an individual content file
-*
-* @param params
-* @param fallback
-* @returns
-*/
-function contentFileResource(params, fallback = "No Content Found") {
+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 locale = injectContentLocale();
 	const contentFilesMap = toSignal(from(loaderPromise()));
 	const input = params || toSignal(inject(ActivatedRoute).paramMap.pipe(map((params) => params.get("slug"))), { requireSync: true });
 	return resource({
@@ -67,11 +81,11 @@ function contentFileResource(params, fallback = "No Content Found") {
 			input: input(),
 			files: contentFilesMap()
 		})),
-		loader: async ({ params }) => {
-			const { input: param, files } = params;
+		loader: async ({ params: resourceParams }) => {
+			const { input: param, files } = resourceParams;
 			if (typeof param === "string") {
 				if (param) {
-					const file = await getContentFile(files, param, fallback);
+					const file = await getContentFile(files, param, fallback, locale, schema);
 					if (typeof file.content === "string") {
 						const rendered = await contentRenderer.render(file.content);
 						return {
@@ -92,7 +106,7 @@ function contentFileResource(params, fallback = "No Content Found") {
 					toc: []
 				};
 			} else {
-				const file = await getContentFile(files, param.customFilename, fallback);
+				const file = await getContentFile(files, param.customFilename, fallback, locale, schema);
 				if (typeof file.content === "string") {
 					const rendered = await contentRenderer.render(file.content);
 					return {

package/fesm2022/analogjs-content-resources.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"analogjs-content-resources.mjs","names":[],"sources":["../../resources/src/content-files-resource.ts","../../resources/src/content-file-resource.ts"],"sourcesContent":["import { resource, ResourceRef } from '@angular/core';\nimport type { ContentFile } from '../../src/lib/content-file';\nimport {\n  filterByLocale,\n  injectContentLocale,\n} from '../../src/lib/content-locale';\nimport type { InjectContentFilesFilterFunction } from '../../src/lib/inject-content-files';\nimport { injectContentListLoader } from '../../src/lib/content-list-loader';\n\nexport function contentFilesResource<Attributes extends Record<string, any>>(\n  filterFn?: InjectContentFilesFilterFunction<Attributes> | undefined,\n): ResourceRef<ContentFile<Attributes>[] | undefined> {\n  const contentListLoader = injectContentListLoader<Attributes>();\n  const locale = injectContentLocale();\n  const contentList = contentListLoader().then((items) => {\n    let results = locale ? filterByLocale(items, locale) : items;\n    if (filterFn) {\n      results = results.filter(filterFn);\n    }\n    return results;\n  });\n\n  return resource({\n    loader: () => contentList,\n  });\n}\n","import type { StandardSchemaV1 } from '@standard-schema/spec';\nimport {\n  computed,\n  inject,\n  resource,\n  Signal,\n  type ResourceRef,\n} from '@angular/core';\nimport { ActivatedRoute } from '@angular/router';\n\nimport { toSignal } from '@angular/core/rxjs-interop';\nimport { from } from 'rxjs';\nimport { map } from 'rxjs/operators';\nimport type { ContentFile } from '../../src/lib/content-file';\nimport { injectContentLocale } from '../../src/lib/content-locale';\nimport { ContentRenderer } from '../../src/lib/content-renderer';\nimport {\n  FrontmatterValidationError,\n  parseRawContentFile,\n  parseRawContentFileAsync,\n} from '../../src/lib/parse-raw-content-file';\nimport { injectContentFileLoader } from '../../src/lib/content-file-loader';\n\nexport interface ContentFileResourceResult<\n  Attributes extends Record<string, any> = Record<string, any>,\n> extends ContentFile<Attributes | Record<string, never>> {\n  toc: Array<{ id: string; level: number; text: string }>;\n}\n\ntype ContentFileParams =\n  | Signal<string | { customFilename: string }>\n  | Signal<string>\n  | Signal<{ customFilename: string }>;\n\nasync function validateAttributes<TSchema extends StandardSchemaV1>(\n  schema: TSchema,\n  attributes: unknown,\n  filename?: string,\n) {\n  const result = await schema['~standard'].validate(attributes);\n  if (result.issues) {\n    throw new FrontmatterValidationError(result.issues, filename);\n  }\n\n  return result.value;\n}\n\nfunction getValidationFilename(filename: string): string {\n  return filename.replace(/^\\/src\\/content\\//, '');\n}\n\nasync function getContentFile<\n  Attributes extends Record<string, any> = Record<string, any>,\n>(\n  contentFiles: Record<string, () => Promise<string>>,\n  slug: string,\n  fallback: string,\n  locale?: string | null,\n  schema?: StandardSchemaV1,\n): Promise<ContentFile<Attributes | Record<string, never>>> {\n  // Normalize file keys so both \"/src/content/...\" and \"/<project>/src/content/...\" resolve.\n  // This mirrors normalization used elsewhere in the content pipeline.\n  const normalizedFiles: Record<string, () => Promise<string>> = {};\n  const stemToKey: Record<string, string> = {};\n  for (const [key, resolver] of Object.entries(contentFiles)) {\n    const normalizedKey = key\n      // replace any prefix up to the content directory with /src/content\n      // use a non-greedy match so nested paths containing \"/content\" are preserved\n      .replace(/^(?:.*?)\\/content(?=\\/)/, '/src/content')\n      // normalize duplicate slashes\n      .replace(/\\/{2,}/g, '/');\n    normalizedFiles[normalizedKey] = resolver;\n    // Index by bare filename stem so slug-only lookups work\n    const stem = normalizedKey\n      .split('/')\n      .pop()\n      ?.replace(/\\.[^.]+$/, '');\n    if (stem && !stemToKey[stem]) {\n      stemToKey[stem] = normalizedKey;\n    }\n  }\n\n  // Try direct file first, then directory index variants, then bare slug via stem\n  const base = `/src/content/${slug}`.replace(/\\/{2,}/g, '/');\n  const candidates = [`${base}.md`, `${base}/index.md`];\n\n  // Try locale-prefixed paths first, then fall back to unprefixed, then bare slug via stem\n  const localeCandidates = locale\n    ? candidates.map((c) =>\n        c.replace('/src/content/', `/src/content/${locale}/`),\n      )\n    : [];\n  const allCandidates = [...localeCandidates, ...candidates];\n  const matchKey =\n    allCandidates.find((k) => k in normalizedFiles) ?? stemToKey[slug];\n  const contentFile = matchKey ? normalizedFiles[matchKey] : undefined;\n\n  if (!contentFile) {\n    return {\n      filename: base,\n      attributes: {},\n      slug: '',\n      content: fallback,\n    } as ContentFile<Attributes | Record<string, never>>;\n  }\n\n  const resolvedBase = matchKey!.replace(/\\.md$/, '');\n  const validationFilename = getValidationFilename(matchKey!);\n\n  return contentFile().then(\n    async (contentFile: string | { default: any; metadata: any }) => {\n      if (typeof contentFile === 'string') {\n        const { content, attributes } = schema\n          ? await parseRawContentFileAsync(\n              contentFile,\n              schema,\n              validationFilename,\n            )\n          : parseRawContentFile<Attributes>(contentFile);\n\n        return {\n          filename: resolvedBase,\n          slug,\n          attributes,\n          content,\n        } as ContentFile<Attributes | Record<string, never>>;\n      }\n\n      const attributes = schema\n        ? await validateAttributes(\n            schema,\n            contentFile.metadata,\n            validationFilename,\n          )\n        : contentFile.metadata;\n\n      return {\n        filename: resolvedBase,\n        slug,\n        attributes,\n        content: contentFile.default,\n      } as ContentFile<Attributes | Record<string, never>>;\n    },\n  );\n}\n\n/**\n * Resource for requesting an individual content file.\n *\n * @example\n * ```typescript\n * // Without schema (existing behavior)\n * const post = contentFileResource<BlogAttributes>();\n *\n * // With schema validation\n * import * as v from 'valibot';\n * const BlogSchema = v.object({\n *   title: v.string(),\n *   date: v.pipe(v.string(), v.isoDate()),\n * });\n * const post = contentFileResource({ schema: BlogSchema });\n * ```\n */\nexport function contentFileResource<\n  Attributes extends Record<string, any> = Record<string, any>,\n>(\n  params?: ContentFileParams,\n  fallback?: string,\n): ResourceRef<ContentFileResourceResult<Attributes> | undefined>;\n\nexport function contentFileResource<TSchema extends StandardSchemaV1>(options: {\n  params?: ContentFileParams;\n  fallback?: string;\n  schema: TSchema;\n}): ResourceRef<\n  | ContentFileResourceResult<\n      StandardSchemaV1.InferOutput<TSchema> & Record<string, any>\n    >\n  | undefined\n>;\n\nexport function contentFileResource(\n  paramsOrOptions?:\n    | ContentFileParams\n    | {\n        params?: ContentFileParams;\n        fallback?: string;\n        schema?: StandardSchemaV1;\n      },\n  fallbackArg = 'No Content Found',\n) {\n  // Detect options-object form vs legacy positional form\n  const isOptionsObject =\n    paramsOrOptions &&\n    typeof paramsOrOptions === 'object' &&\n    !('set' in paramsOrOptions) && // not a Signal\n    ('schema' in paramsOrOptions ||\n      'params' in paramsOrOptions ||\n      'fallback' in paramsOrOptions);\n\n  const params: ContentFileParams | undefined = isOptionsObject\n    ? (paramsOrOptions as { params?: ContentFileParams }).params\n    : (paramsOrOptions as ContentFileParams | undefined);\n  const fallback: string = isOptionsObject\n    ? ((paramsOrOptions as { fallback?: string }).fallback ??\n      'No Content Found')\n    : fallbackArg;\n  const schema: StandardSchemaV1 | undefined = isOptionsObject\n    ? (paramsOrOptions as { schema?: StandardSchemaV1 }).schema\n    : undefined;\n\n  const loaderPromise = injectContentFileLoader();\n  const contentRenderer = inject(ContentRenderer);\n  const locale = injectContentLocale();\n  const contentFilesMap = toSignal(from(loaderPromise()));\n  const input =\n    params ||\n    toSignal(\n      inject(ActivatedRoute).paramMap.pipe(\n        map((params) => params.get('slug') as string),\n      ),\n      { requireSync: true },\n    );\n\n  return resource({\n    params: computed(() => ({ input: input(), files: contentFilesMap() })),\n    loader: async ({ params: resourceParams }) => {\n      const { input: param, files } = resourceParams;\n\n      if (typeof param === 'string') {\n        if (param) {\n          const file = await getContentFile(\n            files!,\n            param,\n            fallback,\n            locale,\n            schema,\n          );\n          if (typeof file.content === 'string') {\n            const rendered = (await contentRenderer.render(file.content)) as {\n              toc?: Array<{ id: string; level: number; text: string }>;\n            };\n            return {\n              ...file,\n              toc: rendered.toc ?? [],\n            };\n          }\n          return {\n            ...file,\n            toc: [],\n          };\n        }\n\n        return {\n          filename: '',\n          slug: '',\n          attributes: {},\n          content: fallback,\n          toc: [],\n        };\n      } else {\n        const file = await getContentFile(\n          files!,\n          param.customFilename,\n          fallback,\n          locale,\n          schema,\n        );\n        if (typeof file.content === 'string') {\n          const rendered = (await contentRenderer.render(file.content)) as {\n            toc?: Array<{ id: string; level: number; text: string }>;\n          };\n          return {\n            ...file,\n            toc: rendered.toc ?? [],\n          };\n        }\n        return {\n          ...file,\n          toc: [],\n        };\n      }\n    },\n  });\n}\n"],"mappings":"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"}

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

@@ -1,4 +1,4 @@
-import { ContentRenderer, NoopContentRenderer } from "@analogjs/content";
+import { n as NoopContentRenderer, t as ContentRenderer } from "./content-renderer.mjs";
 //#region packages/content/shiki-highlighter/src/index.ts
 function withShikiHighlighter(_opts = {}) {
 	return [{

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

@@ -0,0 +1 @@
+{"version":3,"file":"analogjs-content-shiki-highlighter.mjs","names":[],"sources":["../../shiki-highlighter/src/index.ts"],"sourcesContent":["import { Provider } from '@angular/core';\nimport type {\n  BundledLanguage,\n  BundledTheme,\n  CodeOptionsMeta,\n  CodeOptionsMultipleThemes,\n  CodeOptionsSingleTheme,\n  CodeToHastOptionsCommon,\n} from 'shiki';\n\nimport {\n  ContentRenderer,\n  NoopContentRenderer,\n} from '../../src/lib/content-renderer';\n\nexport type ShikiHighlightOptions = Partial<\n  Omit<CodeToHastOptionsCommon<BundledLanguage>, 'lang'>\n> &\n  CodeOptionsMeta &\n  Partial<CodeOptionsSingleTheme<BundledTheme>> &\n  Partial<CodeOptionsMultipleThemes<BundledTheme>>;\n\nexport type WithShikiHighlighterOptions = ShikiHighlightOptions & {\n  container?: string;\n};\n\nexport function withShikiHighlighter(\n  _opts: WithShikiHighlighterOptions = {},\n): Provider[] {\n  return [\n    {\n      provide: ContentRenderer,\n      useClass: NoopContentRenderer,\n    },\n  ];\n}\n"],"mappings":";;AA0BA,SAAgB,qBACd,QAAqC,EAAE,EAAA;AAEvC,QAAO,CACL;EACE,SAAS;EACT,UAAU;EACX,CACF"}