@analogjs/content 3.0.0-alpha.3 → 3.0.0-alpha.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. package/devtools/package.json +4 -0
  2. package/fesm2022/analogjs-content-devtools.mjs +162 -0
  3. package/fesm2022/analogjs-content-devtools.mjs.map +1 -0
  4. package/fesm2022/analogjs-content-md4x.mjs +291 -0
  5. package/fesm2022/analogjs-content-md4x.mjs.map +1 -0
  6. package/fesm2022/analogjs-content-mdc.mjs +170 -0
  7. package/fesm2022/analogjs-content-mdc.mjs.map +1 -0
  8. package/fesm2022/analogjs-content-og.mjs.map +1 -0
  9. package/fesm2022/analogjs-content-prism-highlighter.mjs +5 -4
  10. package/fesm2022/analogjs-content-prism-highlighter.mjs.map +1 -0
  11. package/fesm2022/analogjs-content-resources.mjs +39 -25
  12. package/fesm2022/analogjs-content-resources.mjs.map +1 -0
  13. package/fesm2022/analogjs-content-shiki-highlighter.mjs +1 -1
  14. package/fesm2022/analogjs-content-shiki-highlighter.mjs.map +1 -0
  15. package/fesm2022/analogjs-content.mjs +29 -353
  16. package/fesm2022/analogjs-content.mjs.map +1 -0
  17. package/fesm2022/content-list-loader.mjs +248 -0
  18. package/fesm2022/content-list-loader.mjs.map +1 -0
  19. package/fesm2022/content-renderer.mjs +128 -0
  20. package/fesm2022/content-renderer.mjs.map +1 -0
  21. package/fesm2022/marked-content-highlighter.mjs +40 -0
  22. package/fesm2022/marked-content-highlighter.mjs.map +1 -0
  23. package/fesm2022/parse-raw-content-file.mjs +45 -0
  24. package/fesm2022/parse-raw-content-file.mjs.map +1 -0
  25. package/md4x/package.json +4 -0
  26. package/mdc/package.json +4 -0
  27. package/package.json +72 -36
  28. package/plugin/migrations.json +1 -1
  29. package/plugin/package.json +2 -22
  30. package/plugin/src/index.d.ts +3 -1
  31. package/plugin/src/index.d.ts.map +1 -0
  32. package/plugin/src/index.js +5 -4
  33. package/plugin/src/index.js.map +1 -0
  34. package/plugin/src/migrations/update-markdown-version/compat.d.ts +5 -2
  35. package/plugin/src/migrations/update-markdown-version/compat.d.ts.map +1 -0
  36. package/plugin/src/migrations/update-markdown-version/compat.js +8 -7
  37. package/plugin/src/migrations/update-markdown-version/compat.js.map +1 -0
  38. package/plugin/src/migrations/update-markdown-version/update-markdown-version.d.ts +6 -2
  39. package/plugin/src/migrations/update-markdown-version/update-markdown-version.d.ts.map +1 -0
  40. package/plugin/src/migrations/update-markdown-version/update-markdown-version.js +18 -20
  41. package/plugin/src/migrations/update-markdown-version/update-markdown-version.js.map +1 -0
  42. package/src/lib/devtools/content-devtools-client.ts +215 -0
  43. package/src/lib/devtools/content-devtools.styles.css +194 -0
  44. package/types/devtools/src/index.d.ts +1 -0
  45. package/types/md4x/src/index.d.ts +5 -0
  46. package/types/md4x/src/lib/md4x-content-renderer.service.d.ts +33 -0
  47. package/types/md4x/src/lib/md4x-wasm-content-renderer.service.d.ts +16 -0
  48. package/types/md4x/src/lib/provide-md4x.d.ts +26 -0
  49. package/types/md4x/src/lib/streaming-markdown-renderer.d.ts +21 -0
  50. package/types/mdc/src/index.d.ts +2 -0
  51. package/types/mdc/src/lib/mdc-component-registry.d.ts +25 -0
  52. package/types/mdc/src/lib/mdc-renderer.directive.d.ts +33 -0
  53. package/types/prism-highlighter/src/lib/prism-highlighter.d.ts +1 -1
  54. package/types/resources/src/content-file-resource.d.ts +32 -7
  55. package/types/resources/src/content-files-resource.d.ts +2 -1
  56. package/types/src/index.d.ts +6 -3
  57. package/types/src/lib/content-locale.d.ts +68 -0
  58. package/types/src/lib/devtools/content-devtools-plugin.d.ts +23 -0
  59. package/types/src/lib/devtools/content-devtools-renderer.d.ts +23 -0
  60. package/types/src/lib/devtools/index.d.ts +23 -0
  61. package/types/src/lib/parse-raw-content-file.d.ts +15 -1
  62. package/plugin/README.md +0 -11
  63. package/plugin/src/migrations/update-markdown-renderer-feature/compat.d.ts +0 -3
  64. package/plugin/src/migrations/update-markdown-renderer-feature/compat.js +0 -8
  65. package/plugin/src/migrations/update-markdown-renderer-feature/update-markdown-renderer-feature.d.ts +0 -2
  66. package/plugin/src/migrations/update-markdown-renderer-feature/update-markdown-renderer-feature.js +0 -48
@@ -0,0 +1 @@
1
+ {"version":3,"file":"analogjs-content-og.mjs","names":[],"sources":["../../og/src/lib/og.ts"],"sourcesContent":["// Credit for modified source: https://github.com/etherCorps/sveltekit-og/blob/main/src/lib/api.ts\n\nimport satori from 'satori';\nimport { html as toReactElement } from 'satori-html';\nimport sharp from 'sharp';\n\nimport { ImageResponseOptions } from './options';\n\nexport const generateImage = async (\n element: string,\n options: ImageResponseOptions,\n): Promise<Buffer> => {\n const elementHtml = toReactElement(element);\n const svg = await satori(elementHtml as any, {\n width: options.width || 1200,\n height: options.height || 630,\n fonts: options.fonts?.length ? options.fonts : [],\n tailwindConfig: options.tailwindConfig,\n });\n const svgBuffer = Buffer.from(svg);\n const png = sharp(svgBuffer).png().toBuffer();\n\n const pngBuffer = await png;\n\n return pngBuffer;\n};\n\nexport class ImageResponse extends Response {\n constructor(element: string, options: ImageResponseOptions = {}) {\n super();\n\n const body = new ReadableStream({\n async start(controller) {\n const buffer = await generateImage(element, options);\n controller.enqueue(buffer);\n controller.close();\n },\n });\n\n return new Response(body, {\n headers: {\n 'Content-Type': 'image/png',\n 'Cache-Control': options.debug\n ? 'no-cache, no-store'\n : 'public, immutable, no-transform, max-age=31536000',\n ...options.headers,\n },\n status: options.status || 200,\n statusText: options.statusText,\n });\n }\n}\n"],"mappings":";;;;IAYQ,gBAAc,OAAe,SAAQ,YAAA;CAEzC,MAAO,MAAA,MAAQ,OADC,KAA2B,QAAA,EACnB;EACxB,OAAQ,QAAQ,SAAU;EAC1B,QAAO,QAAe,UAAS;EAC/B,OAAA,QAAgB,OAAQ,SAAA,QAAA,QAAA,EAAA;EACxB,gBAAA,QAAA;EACF,CAAA;QAKO,MAFD,MAFY,OAAU,KAAC,IAAM,CAEX,CAAA,KAAA,CAAA,UAAA;;IAMZ,gBAAA,cAAmD,SAAE;CAC/D,YAAO,SAAA,UAAA,EAAA,EAAA;AAED,SAAO;EAET,MAAM,OAAS,IAAM,eAAc,EACnC,MAAW,MAAQ,YAAO;GACf,MAAO,SAAA,MAAA,cAAA,SAAA,QAAA;AAEpB,cAAA,QAAA,OAAA;AAES,cAAS,OAAM;KAEtB,CAAA;AACA,SAAA,IAAA,SAAiB,MAAQ;GAGtB,SAAQ;IACZ,gBAAA;IACO,iBAAkB,QAAA,QACd,uBACZ"}
@@ -1,6 +1,7 @@
1
+ import { n as NoopContentRenderer, t as ContentRenderer } from "./content-renderer.mjs";
2
+ import { t as MarkedContentHighlighter } from "./marked-content-highlighter.mjs";
1
3
  import * as i0 from "@angular/core";
2
4
  import { Injectable } from "@angular/core";
3
- import { ContentRenderer, MarkedContentHighlighter, NoopContentRenderer } from "@analogjs/content";
4
5
  import { markedHighlight } from "marked-highlight";
5
6
  import Prism$1 from "prismjs";
6
7
  import "prismjs/plugins/toolbar/prism-toolbar";
@@ -45,7 +46,7 @@ var PrismHighlighter = class PrismHighlighter extends MarkedContentHighlighter {
45
46
  static {
46
47
  this.ɵfac = i0.ɵɵngDeclareFactory({
47
48
  minVersion: "12.0.0",
48
- version: "21.1.1",
49
+ version: "21.2.8",
49
50
  ngImport: i0,
50
51
  type: PrismHighlighter,
51
52
  deps: null,
@@ -55,7 +56,7 @@ var PrismHighlighter = class PrismHighlighter extends MarkedContentHighlighter {
55
56
  static {
56
57
  this.ɵprov = i0.ɵɵngDeclareInjectable({
57
58
  minVersion: "12.0.0",
58
- version: "21.1.1",
59
+ version: "21.2.8",
59
60
  ngImport: i0,
60
61
  type: PrismHighlighter
61
62
  });
@@ -63,7 +64,7 @@ var PrismHighlighter = class PrismHighlighter extends MarkedContentHighlighter {
63
64
  };
64
65
  i0.ɵɵngDeclareClassMetadata({
65
66
  minVersion: "12.0.0",
66
- version: "21.1.1",
67
+ version: "21.2.8",
67
68
  ngImport: i0,
68
69
  type: PrismHighlighter,
69
70
  decorators: [{ type: Injectable }]
@@ -0,0 +1 @@
1
+ {"version":3,"file":"analogjs-content-prism-highlighter.mjs","names":[],"sources":["../../prism-highlighter/src/lib/prism-highlighter.ts","../../prism-highlighter/src/lib/prism/angular.ts","../../prism-highlighter/src/index.ts"],"sourcesContent":["import { Injectable } from '@angular/core';\nimport { markedHighlight } from 'marked-highlight';\n\nimport { MarkedContentHighlighter } from '../../../src/lib/marked-content-highlighter';\n\ndeclare const Prism: typeof import('prismjs');\n\ntype HighlightExtension = ReturnType<\n MarkedContentHighlighter['getHighlightExtension']\n>;\n\n@Injectable()\nexport class PrismHighlighter extends MarkedContentHighlighter {\n override augmentCodeBlock(code: string, lang: string): string {\n const classes =\n lang.startsWith('diff') && Prism.languages['diff']\n ? `language-${lang} diff-highlight`\n : `language-${lang.replace('diff-', '')}`;\n return `<pre class=\"${classes}\"><code class=\"${classes}\">${code}</code></pre>`;\n }\n\n override getHighlightExtension(): import('marked').MarkedExtension {\n return markedHighlight({\n async: true,\n highlight: (code: string, lang: string) => {\n let diff = lang?.startsWith('diff-');\n lang = diff ? lang.replace('diff-', '') : lang || 'typescript';\n\n if (diff && !Prism.languages['diff']) {\n diff = false;\n console.warn(`Notice:\n ---------------------------------------------------------------------------------------\n The \\`diff\\` language and plugin are not available in the provided setup.\n To enable it, add the following imports your \\`app.config.ts\\`:\n import 'prismjs/components/prism-diff';\n import 'prismjs/plugins/diff-highlight/prism-diff-highlight';\n ---------------------------------------------------------------------------------------\n `);\n }\n\n if (!Prism.languages[lang]) {\n if (lang !== 'mermaid') {\n console.warn(`Notice:\n ---------------------------------------------------------------------------------------\n The requested language '${lang}' is not available in the provided setup.\n To enable it, add the following import your \\`app.config.ts\\`:\n import 'prismjs/components/prism-${lang}';\n ---------------------------------------------------------------------------------------\n `);\n }\n return code;\n }\n return Prism.highlight(\n code,\n diff ? Prism.languages['diff'] : Prism.languages[lang],\n lang,\n );\n },\n }) as HighlightExtension;\n }\n}\n","import Prism from 'prismjs';\n\n(function () {\n if (typeof Prism === 'undefined') {\n return;\n }\n\n Prism.languages['angular'] = Prism.languages.extend('markup', {\n keyword:\n /(?:@if|@for|@switch|@defer|@loading|@error|@placeholder|prefetch)\\b/,\n operator: /\\b(?:on|when)\\b/,\n number: {\n pattern: /\\b(minimum|after)\\s+\\d+(?:s|ms|)/gi,\n lookbehind: true,\n },\n builtin: {\n pattern:\n /\\b(?:viewport|timer|minimum|after|hover|idle|immediate|interaction)/,\n },\n function:\n /#?(?!\\s)[_$a-zA-Z\\xA0-\\uFFFF](?:(?!\\s)[$\\w\\xA0-\\uFFFF])*(?=\\s*(?:\\.\\s*(?:apply|bind|call)\\s*)?\\()/,\n });\n\n Prism.languages['ng'] = Prism.languages['angular'];\n})();\n","import { Provider } from '@angular/core';\nimport { PrismHighlighter } from './lib/prism-highlighter';\n\nimport {\n ContentRenderer,\n NoopContentRenderer,\n} from '../../src/lib/content-renderer';\nimport 'prismjs';\nimport 'prismjs/plugins/toolbar/prism-toolbar';\nimport 'prismjs/plugins/copy-to-clipboard/prism-copy-to-clipboard';\nimport './lib/prism/angular';\n\nexport { PrismHighlighter };\n\nexport function withPrismHighlighter(): Provider[] {\n return [{ provide: ContentRenderer, useClass: NoopContentRenderer }];\n}\n"],"mappings":";;;;;;;;;AAYO,IAAA,mBAAA,MAAA,yBAAM,yBAAyB;CACpC,iBAA0B,MAAc,MAAsB;EACtD,MAAA,UACC,KAAA,WAAW,OAAW,IAAM,MAAA,UAAU,UAGtC,YAAe,KAAA,mBAAA,YAAA,KAAA,QAAA,SAAA,GAAA;AAGxB,SAAA,eAAmE,QAAA,iBAAA,QAAA,IAAA,KAAA;;CAE/D,wBAAO;AACP,SAAY,gBAA+B;GACrC,OAAO;GACJ,YAAY,MAAA,SAAQ;IAEf,IAAC,OAAM,MAAU,WAAS,QAAA;AAC7B,WAAA,OAAA,KAAA,QAAA,SAAA,GAAA,GAAA,QAAA;AACC,QAAK,QAAA,CAAA,MAAA,UAAA,SAAA;;;;;;;;;cAUV;;AAEO,QAAK,CAAA,MAAA,UAAA,OAAA;qCAEK,KAAK;;;;yCAInB,KAAA;;gBAEC;AAEI,YACX;;AAKJ,WAAA,MAAA,UAAA,MAAA,OAAA,MAAA,UAAA,UAAA,MAAA,UAAA,OAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CCxDL,WAAY;AACX,KAAI,OAAO,YAAU,YACnB;AAGF,SAAM,UAAU,aAAa,QAAM,UAAU,OAAO,UAAU;EAC5D,SACE;EACF,UAAU;EACV,QAAQ;GACG,SAAA;GACT,YAAY;GACb;EACD,SACE,EAIA,SAAA,uEACF;EAEI,UAAU;EACd,CAAA;;;;;ACVJ,SAAgB,uBAAmC;AACjD,QAAQ,CAAA;EAAA,SAAA;EAAA,UAAA;EAAA,CAAA"}
@@ -1,29 +1,44 @@
1
+ import { t as ContentRenderer } from "./content-renderer.mjs";
2
+ import { a as injectContentFileLoader, f as filterByLocale, n as injectContentListLoader, p as injectContentLocale } from "./content-list-loader.mjs";
3
+ import { n as parseRawContentFile, r as parseRawContentFileAsync, t as FrontmatterValidationError } from "./parse-raw-content-file.mjs";
1
4
  import { computed, inject, resource } from "@angular/core";
2
5
  import { ActivatedRoute } from "@angular/router";
3
6
  import { from } from "rxjs";
4
7
  import { map } from "rxjs/operators";
5
8
  import { toSignal } from "@angular/core/rxjs-interop";
6
- import { ContentRenderer, injectContentFileLoader, injectContentListLoader, parseRawContentFile } from "@analogjs/content";
7
9
  //#region packages/content/resources/src/content-files-resource.ts
8
10
  function contentFilesResource(filterFn) {
9
- const contentList = injectContentListLoader()().then((items) => filterFn ? items.filter(filterFn) : items);
11
+ const contentListLoader = injectContentListLoader();
12
+ const locale = injectContentLocale();
13
+ const contentList = contentListLoader().then((items) => {
14
+ let results = locale ? filterByLocale(items, locale) : items;
15
+ if (filterFn) results = results.filter(filterFn);
16
+ return results;
17
+ });
10
18
  return resource({ loader: () => contentList });
11
19
  }
12
20
  //#endregion
13
21
  //#region packages/content/resources/src/content-file-resource.ts
14
- async function getContentFile(contentFiles, slug, fallback) {
22
+ async function validateAttributes(schema, attributes, filename) {
23
+ const result = await schema["~standard"].validate(attributes);
24
+ if (result.issues) throw new FrontmatterValidationError(result.issues, filename);
25
+ return result.value;
26
+ }
27
+ function getValidationFilename(filename) {
28
+ return filename.replace(/^\/src\/content\//, "");
29
+ }
30
+ async function getContentFile(contentFiles, slug, fallback, locale, schema) {
15
31
  const normalizedFiles = {};
32
+ const stemToKey = {};
16
33
  for (const [key, resolver] of Object.entries(contentFiles)) {
17
34
  const normalizedKey = key.replace(/^(?:.*?)\/content(?=\/)/, "/src/content").replace(/\/{2,}/g, "/");
18
35
  normalizedFiles[normalizedKey] = resolver;
36
+ const stem = normalizedKey.split("/").pop()?.replace(/\.[^.]+$/, "");
37
+ if (stem && !stemToKey[stem]) stemToKey[stem] = normalizedKey;
19
38
  }
20
39
  const base = `/src/content/${slug}`.replace(/\/{2,}/g, "/");
21
- const matchKey = [
22
- `${base}.md`,
23
- `${base}.agx`,
24
- `${base}/index.md`,
25
- `${base}/index.agx`
26
- ].find((k) => k in normalizedFiles);
40
+ const candidates = [`${base}.md`, `${base}/index.md`];
41
+ const matchKey = [...locale ? candidates.map((c) => c.replace("/src/content/", `/src/content/${locale}/`)) : [], ...candidates].find((k) => k in normalizedFiles) ?? stemToKey[slug];
27
42
  const contentFile = matchKey ? normalizedFiles[matchKey] : void 0;
28
43
  if (!contentFile) return {
29
44
  filename: base,
@@ -31,10 +46,11 @@ async function getContentFile(contentFiles, slug, fallback) {
31
46
  slug: "",
32
47
  content: fallback
33
48
  };
34
- const resolvedBase = matchKey.replace(/\.(md|agx)$/, "");
35
- return contentFile().then((contentFile) => {
49
+ const resolvedBase = matchKey.replace(/\.md$/, "");
50
+ const validationFilename = getValidationFilename(matchKey);
51
+ return contentFile().then(async (contentFile) => {
36
52
  if (typeof contentFile === "string") {
37
- const { content, attributes } = parseRawContentFile(contentFile);
53
+ const { content, attributes } = schema ? await parseRawContentFileAsync(contentFile, schema, validationFilename) : parseRawContentFile(contentFile);
38
54
  return {
39
55
  filename: resolvedBase,
40
56
  slug,
@@ -45,21 +61,19 @@ async function getContentFile(contentFiles, slug, fallback) {
45
61
  return {
46
62
  filename: resolvedBase,
47
63
  slug,
48
- attributes: contentFile.metadata,
64
+ attributes: schema ? await validateAttributes(schema, contentFile.metadata, validationFilename) : contentFile.metadata,
49
65
  content: contentFile.default
50
66
  };
51
67
  });
52
68
  }
53
- /**
54
- * Resource for requesting an individual content file
55
- *
56
- * @param params
57
- * @param fallback
58
- * @returns
59
- */
60
- function contentFileResource(params, fallback = "No Content Found") {
69
+ function contentFileResource(paramsOrOptions, fallbackArg = "No Content Found") {
70
+ const isOptionsObject = paramsOrOptions && typeof paramsOrOptions === "object" && !("set" in paramsOrOptions) && ("schema" in paramsOrOptions || "params" in paramsOrOptions || "fallback" in paramsOrOptions);
71
+ const params = isOptionsObject ? paramsOrOptions.params : paramsOrOptions;
72
+ const fallback = isOptionsObject ? paramsOrOptions.fallback ?? "No Content Found" : fallbackArg;
73
+ const schema = isOptionsObject ? paramsOrOptions.schema : void 0;
61
74
  const loaderPromise = injectContentFileLoader();
62
75
  const contentRenderer = inject(ContentRenderer);
76
+ const locale = injectContentLocale();
63
77
  const contentFilesMap = toSignal(from(loaderPromise()));
64
78
  const input = params || toSignal(inject(ActivatedRoute).paramMap.pipe(map((params) => params.get("slug"))), { requireSync: true });
65
79
  return resource({
@@ -67,11 +81,11 @@ function contentFileResource(params, fallback = "No Content Found") {
67
81
  input: input(),
68
82
  files: contentFilesMap()
69
83
  })),
70
- loader: async ({ params }) => {
71
- const { input: param, files } = params;
84
+ loader: async ({ params: resourceParams }) => {
85
+ const { input: param, files } = resourceParams;
72
86
  if (typeof param === "string") {
73
87
  if (param) {
74
- const file = await getContentFile(files, param, fallback);
88
+ const file = await getContentFile(files, param, fallback, locale, schema);
75
89
  if (typeof file.content === "string") {
76
90
  const rendered = await contentRenderer.render(file.content);
77
91
  return {
@@ -92,7 +106,7 @@ function contentFileResource(params, fallback = "No Content Found") {
92
106
  toc: []
93
107
  };
94
108
  } else {
95
- const file = await getContentFile(files, param.customFilename, fallback);
109
+ const file = await getContentFile(files, param.customFilename, fallback, locale, schema);
96
110
  if (typeof file.content === "string") {
97
111
  const rendered = await contentRenderer.render(file.content);
98
112
  return {
@@ -0,0 +1 @@
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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"}
@@ -1,4 +1,4 @@
1
- import { ContentRenderer, NoopContentRenderer } from "@analogjs/content";
1
+ import { n as NoopContentRenderer, t as ContentRenderer } from "./content-renderer.mjs";
2
2
  //#region packages/content/shiki-highlighter/src/index.ts
3
3
  function withShikiHighlighter(_opts = {}) {
4
4
  return [{
@@ -0,0 +1 @@
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,EAC3B;AACZ,QACE,CACE;EACU,SAAA;EAEb,UAAA"}