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

package/migrations/migration.json

@@ -1,4 +1,10 @@
 {
   "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
-  "schematics": {}
+  "schematics": {
+    "migrate-to-separated-plugins": {
+      "version": "3.0.0-alpha.56",
+      "description": "Migrate Analog vite.config from a single analog() call to the separated analog() + angular() + nitro() plugin shape",
+      "factory": "./migrate-to-separated-plugins/migrate-to-separated-plugins"
+    }
+  }
 }

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@analogjs/platform",
-  "version": "3.0.0-alpha.9",
+  "version": "3.0.0-alpha.90",
   "description": "The fullstack meta-framework for Angular",
   "type": "module",
   "author": "Brandon Roberts <robertsbt@gmail.com>",
   "exports": {
-    ".": "./src/index.js",
+    ".": {
+      "types": "./src/index.d.ts",
+      "default": "./src/index.js"
+    },
     "./package.json": "./package.json"
   },
   "keywords": [
@@ -28,23 +31,34 @@
     "url": "https://github.com/sponsors/brandonroberts"
   },
   "dependencies": {
-    "nitro": "3.0.260311-beta",
-    "@analogjs/vite-plugin-angular": "^3.0.0-alpha.9",
-    "@analogjs/vite-plugin-nitro": "^3.0.0-alpha.9",
-    "rolldown": "^1.0.0-rc.9",
-    "vitefu": "^1.1.2"
+    "@analogjs/vite-plugin-angular": "3.0.0-alpha.90",
+    "es-toolkit": "^1.45.1",
+    "front-matter": "^4.0.2",
+    "h3": "^2.0.1-rc.31",
+    "magic-string": "^0.30.21",
+    "nitro": "3.0.260903-beta",
+    "obug": "^2.1.1",
+    "ofetch": "2.0.0-alpha.3",
+    "oxc-parser": "^0.124.0",
+    "rolldown": "^1.0.0-rc.13",
+    "tinyglobby": "^0.2.15",
+    "vitefu": "^1.1.2",
+    "xmlbuilder2": "^4.0.3"
+  },
+  "devDependencies": {
+    "@babel/core": "^8.0.0"
   },
   "peerDependencies": {
-    "@nx/angular": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^22",
-    "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^22",
-    "@nx/vite": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^22",
-    "marked": "^15.0.12",
+    "@nx/angular": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0 || ^23",
+    "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0 || ^23",
+    "@nx/vite": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0 || ^23",
+    "marked": "^18.0.0",
     "marked-gfm-heading-id": "^4.1.3",
     "marked-highlight": "^2.2.3",
     "marked-mangle": "^1.1.12",
     "marked-shiki": "^1.2.1",
-    "shiki": "^1.29.2",
-    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
+    "shiki": "^1.29.2 || ^4.0.2",
+    "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "peerDependenciesMeta": {
     "@nx/angular": {
@@ -69,7 +83,7 @@
       "optional": true
     }
   },
-  "builders": "./src/lib/nx-plugin/executors.json",
+  "builders": "./src/lib/nx-plugin/builders.json",
   "executors": "./src/lib/nx-plugin/executors.json",
   "generators": "./src/lib/nx-plugin/generators.json",
   "schematics": "./src/lib/nx-plugin/generators.json",

package/src/index.d.ts

@@ -1,3 +1,6 @@
-import { platformPlugin } from './lib/platform-plugin.js';
-export type { Options, PrerenderContentFile } from './lib/options';
+import { platformPlugin } from "./lib/platform-plugin.js";
+export type { Options, PrerenderSitemapConfig, TypedRouterOptions, PrerenderContentFile, SitemapConfig, SitemapEntry, SitemapExcludeRule, SitemapPriority, SitemapRouteDefinition, SitemapRouteInput, SitemapRouteSource, SitemapTransform } from "./lib/options.js";
+export { discoverLibraryRoutes } from "./lib/discover-library-routes.js";
+export type { DiscoveredLibraryRoutes } from "./lib/discover-library-routes.js";
+export { routeGenerationPlugin } from "./lib/route-generation-plugin.js";
 export default platformPlugin;

package/src/index.js

@@ -1,7 +1,9 @@
+import { discoverLibraryRoutes } from "./lib/discover-library-routes.js";
+import { routeGenerationPlugin } from "./lib/route-generation-plugin.js";
 import { platformPlugin } from "./lib/platform-plugin.js";
 //#region packages/platform/src/index.ts
 var src_default = platformPlugin;
 //#endregion
-export { src_default as default };
+export { src_default as default, discoverLibraryRoutes, routeGenerationPlugin };
 
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../../packages/platform/src/index.ts"],"sourcesContent":["import { platformPlugin } from './lib/platform-plugin.js';\n\nexport type { Options, PrerenderContentFile } from './lib/options';\nexport default platformPlugin;\n"],"mappings":";;AAGA,IAAA,cAAe"}
+{"version":3,"file":"index.js","names":[],"sources":["../../src/index.ts"],"sourcesContent":["import { platformPlugin } from './lib/platform-plugin.js';\n\nexport type {\n  Options,\n  PrerenderSitemapConfig,\n  TypedRouterOptions,\n  PrerenderContentFile,\n  SitemapConfig,\n  SitemapEntry,\n  SitemapExcludeRule,\n  SitemapPriority,\n  SitemapRouteDefinition,\n  SitemapRouteInput,\n  SitemapRouteSource,\n  SitemapTransform,\n} from './lib/options.js';\nexport { discoverLibraryRoutes } from './lib/discover-library-routes.js';\nexport type { DiscoveredLibraryRoutes } from './lib/discover-library-routes.js';\nexport { routeGenerationPlugin } from './lib/route-generation-plugin.js';\nexport default platformPlugin;\n"],"mappings":";;;;AAmBA,IAAA,cAAe"}

package/src/lib/analog-integration-plugin.d.ts

@@ -0,0 +1,9 @@
+import type { AnalogIntegrationPlugin } from "@analogjs/vite-plugin-angular";
+import type { Options } from "./options.js";
+/**
+* The platform's `analog.setup()` hook into `@analogjs/vite-plugin-angular`.
+* Keeps Angular away from the platform's content modules and registers
+* `additionalPagesDirs` so workspace library pages compile without a matching
+* `include` on `angular()`.
+*/
+export declare function analogIntegrationPlugin(options?: Options): AnalogIntegrationPlugin;

package/src/lib/analog-integration-plugin.js

@@ -0,0 +1,22 @@
+import { pageGlobs } from "./discover-library-routes.js";
+//#region packages/platform/src/lib/analog-integration-plugin.ts
+/**
+* The platform's `analog.setup()` hook into `@analogjs/vite-plugin-angular`.
+* Keeps Angular away from the platform's content modules and registers
+* `additionalPagesDirs` so workspace library pages compile without a matching
+* `include` on `angular()`.
+*/
+function analogIntegrationPlugin(options) {
+	const pagesDirs = options?.additionalPagesDirs ?? [];
+	return {
+		name: "analogjs-platform-angular-integration",
+		analog: { setup(ctx) {
+			ctx.registerTransformFilter((_code, id) => !(id.includes("?") && id.includes("analog-content-")));
+			if (pagesDirs.length) ctx.addInclude(pageGlobs(pagesDirs));
+		} }
+	};
+}
+//#endregion
+export { analogIntegrationPlugin };
+
+//# sourceMappingURL=analog-integration-plugin.js.map

package/src/lib/analog-integration-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"analog-integration-plugin.js","names":[],"sources":["../../../src/lib/analog-integration-plugin.ts"],"sourcesContent":["import type { AnalogIntegrationPlugin } from '@analogjs/vite-plugin-angular';\n\nimport { pageGlobs } from './discover-library-routes.js';\nimport type { Options } from './options.js';\n\n/**\n * The platform's `analog.setup()` hook into `@analogjs/vite-plugin-angular`.\n * Keeps Angular away from the platform's content modules and registers\n * `additionalPagesDirs` so workspace library pages compile without a matching\n * `include` on `angular()`.\n */\nexport function analogIntegrationPlugin(\n  options?: Options,\n): AnalogIntegrationPlugin {\n  const pagesDirs = options?.additionalPagesDirs ?? [];\n\n  return {\n    name: 'analogjs-platform-angular-integration',\n    analog: {\n      setup(ctx) {\n        // Content files are imported with `?analog-content-*` markers and\n        // served by the content plugin, never compiled by Angular.\n        ctx.registerTransformFilter(\n          (_code, id) => !(id.includes('?') && id.includes('analog-content-')),\n        );\n        if (pagesDirs.length) {\n          ctx.addInclude(pageGlobs(pagesDirs));\n        }\n      },\n    },\n  };\n}\n"],"mappings":";;;;;;;;AAWA,SAAgB,wBACd,SACyB;CACzB,MAAM,YAAY,SAAS,uBAAuB,EAAE;AAEpD,QAAO;EACL,MAAM;EACN,QAAQ,EACN,MAAM,KAAK;AAGT,OAAI,yBACD,OAAO,OAAO,EAAE,GAAG,SAAS,IAAI,IAAI,GAAG,SAAS,kBAAkB,EACpE;AACD,OAAI,UAAU,OACZ,KAAI,WAAW,UAAU,UAAU,CAAC;KAGzC;EACF"}

package/src/lib/clear-client-page-endpoint.d.ts

@@ -1,2 +1,2 @@
-import { Plugin } from 'vite';
-export declare function clearClientPageEndpointsPlugin(): Plugin[];
+import { Plugin } from "vite";
+export declare function clearClientPageEndpointsPlugin(): Plugin;

package/src/lib/clear-client-page-endpoint.js

@@ -1,21 +1,43 @@
+import { serverFnFileId } from "./server-fn-id.js";
+import { injectServerFnIds } from "./inject-server-fn-ids.js";
+import { scrubServerFnModule } from "./server-fn-client-transform.js";
 import { normalizePath } from "vite";
 //#region packages/platform/src/lib/clear-client-page-endpoint.ts
 function clearClientPageEndpointsPlugin() {
-	return [{
+	let projectRoot = process.cwd();
+	let isBuild = true;
+	return {
 		name: "analogjs-platform-clear-client-page-endpoint",
-		apply: "build",
 		config() {
 			return { build: { rollupOptions: { onwarn(warning) {
 				if (warning.message.includes("empty chunk") && warning.message.endsWith(".server")) return;
 			} } } };
 		},
-		transform(_code, id, options) {
-			if (!options?.ssr && id.includes(normalizePath("src/app/pages")) && id.endsWith(".server.ts")) return {
+		configResolved(config) {
+			projectRoot = config.root;
+			isBuild = config.command === "build";
+		},
+		transform(code, id, options) {
+			if (!id.endsWith(".server.ts")) return;
+			const fileId = serverFnFileId(id, projectRoot);
+			if (options?.ssr) {
+				const injected = injectServerFnIds(code, fileId);
+				return injected ? {
+					code: injected.code,
+					map: null
+				} : void 0;
+			}
+			const scrubbed = scrubServerFnModule(code, fileId);
+			if (scrubbed) return {
+				code: scrubbed.code,
+				map: { mappings: "" }
+			};
+			if (isBuild && id.includes(normalizePath("src/app/pages"))) return {
 				code: "export default undefined;",
 				map: null
 			};
 		}
-	}];
+	};
 }
 //#endregion
 export { clearClientPageEndpointsPlugin };

package/src/lib/clear-client-page-endpoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"clear-client-page-endpoint.js","names":[],"sources":["../../../../../packages/platform/src/lib/clear-client-page-endpoint.ts"],"sourcesContent":["import { Plugin, normalizePath } from 'vite';\n\nexport function clearClientPageEndpointsPlugin(): Plugin[] {\n  return [\n    {\n      name: 'analogjs-platform-clear-client-page-endpoint',\n      apply: 'build',\n      config() {\n        return {\n          build: {\n            rollupOptions: {\n              onwarn(warning) {\n                if (\n                  warning.message.includes('empty chunk') &&\n                  warning.message.endsWith('.server')\n                ) {\n                  return;\n                }\n              },\n            },\n          },\n        };\n      },\n      transform(_code, id, options) {\n        if (\n          !options?.ssr &&\n          id.includes(normalizePath('src/app/pages')) &&\n          id.endsWith('.server.ts')\n        ) {\n          return {\n            code: 'export default undefined;',\n            map: null,\n          };\n        }\n\n        return;\n      },\n    },\n  ];\n}\n"],"mappings":";;AAEA,SAAgB,iCAA2C;AACzD,QAAO,CACL;EACE,MAAM;EACN,OAAO;EACP,SAAS;AACP,UAAO,EACL,OAAO,EACL,eAAe,EACb,OAAO,SAAS;AACd,QACE,QAAQ,QAAQ,SAAS,cAAc,IACvC,QAAQ,QAAQ,SAAS,UAAU,CAEnC;MAGL,EACF,EACF;;EAEH,UAAU,OAAO,IAAI,SAAS;AAC5B,OACE,CAAC,SAAS,OACV,GAAG,SAAS,cAAc,gBAAgB,CAAC,IAC3C,GAAG,SAAS,aAAa,CAEzB,QAAO;IACL,MAAM;IACN,KAAK;IACN;;EAKN,CACF"}
+{"version":3,"file":"clear-client-page-endpoint.js","names":[],"sources":["../../../src/lib/clear-client-page-endpoint.ts"],"sourcesContent":["import { Plugin, normalizePath } from 'vite';\nimport { injectServerFnIds } from './inject-server-fn-ids.js';\nimport { serverFnFileId } from './server-fn-id.js';\n\nimport { scrubServerFnModule } from './server-fn-client-transform.js';\n\nexport function clearClientPageEndpointsPlugin(): Plugin {\n  let projectRoot = process.cwd();\n  let isBuild = true;\n\n  return {\n    name: 'analogjs-platform-clear-client-page-endpoint',\n    config() {\n      return {\n        build: {\n          rollupOptions: {\n            onwarn(warning) {\n              if (\n                warning.message.includes('empty chunk') &&\n                warning.message.endsWith('.server')\n              ) {\n                return;\n              }\n            },\n          },\n        },\n      };\n    },\n    configResolved(config) {\n      projectRoot = config.root;\n      isBuild = config.command === 'build';\n    },\n    transform(code, id, options) {\n      if (!id.endsWith('.server.ts')) {\n        return;\n      }\n\n      // Server-function ids are derived from the project-root-relative path so\n      // the client proxy and the server registration always resolve to the same\n      // opaque, collision-free route.\n      const fileId = serverFnFileId(id, projectRoot);\n\n      if (options?.ssr) {\n        // SSR build keeps the real handlers but stamps the derived id into each\n        // serverFn config so it registers under the route the client calls.\n        const injected = injectServerFnIds(code, fileId);\n        return injected ? { code: injected.code, map: null } : undefined;\n      }\n\n      // Client build: a `.server.ts` defining server functions is rewritten to\n      // client-safe proxies (the `{ id, url, method }` refs the browser\n      // dispatches through); handlers and server imports are dropped so they\n      // tree-shake away.\n      const scrubbed = scrubServerFnModule(code, fileId);\n      if (scrubbed) {\n        // An empty mapping, not `null`: a null map lets the original module —\n        // handlers and all — survive in `sourcesContent` further down the\n        // pipeline, which would ship the server code to the browser after the\n        // scrub went to the trouble of removing it.\n        return { code: scrubbed.code, map: { mappings: '' } };\n      }\n\n      // Page load/action endpoints carry no client-consumable exports. Only the\n      // client build empties them; the dev server never pulls them into the\n      // browser graph, and emptying them there would break the SSR request.\n      if (isBuild && id.includes(normalizePath('src/app/pages'))) {\n        return {\n          code: 'export default undefined;',\n          map: null,\n        };\n      }\n\n      return;\n    },\n  };\n}\n"],"mappings":";;;;;AAMA,SAAgB,iCAAyC;CACvD,IAAI,cAAc,QAAQ,KAAK;CAC/B,IAAI,UAAU;AAEd,QAAO;EACL,MAAM;EACN,SAAS;AACP,UAAO,EACL,OAAO,EACL,eAAe,EACb,OAAO,SAAS;AACd,QACE,QAAQ,QAAQ,SAAS,cAAc,IACvC,QAAQ,QAAQ,SAAS,UAAU,CAEnC;MAGL,EACF,EACF;;EAEH,eAAe,QAAQ;AACrB,iBAAc,OAAO;AACrB,aAAU,OAAO,YAAY;;EAE/B,UAAU,MAAM,IAAI,SAAS;AAC3B,OAAI,CAAC,GAAG,SAAS,aAAa,CAC5B;GAMF,MAAM,SAAS,eAAe,IAAI,YAAY;AAE9C,OAAI,SAAS,KAAK;IAGhB,MAAM,WAAW,kBAAkB,MAAM,OAAO;AAChD,WAAO,WAAW;KAAE,MAAM,SAAS;KAAM,KAAK;KAAM,GAAG,KAAA;;GAOzD,MAAM,WAAW,oBAAoB,MAAM,OAAO;AAClD,OAAI,SAKF,QAAO;IAAE,MAAM,SAAS;IAAM,KAAK,EAAE,UAAU,IAAI;IAAE;AAMvD,OAAI,WAAW,GAAG,SAAS,cAAc,gBAAgB,CAAC,CACxD,QAAO;IACL,MAAM;IACN,KAAK;IACN;;EAKN"}

package/src/lib/content/marked/index.d.ts

@@ -1,8 +1,8 @@
-import { MarkedExtension } from 'marked';
-import { MarkedSetupService } from './marked-setup.service.js';
-import { MarkedContentHighlighter } from './marked-content-highlighter.js';
+import { MarkedExtension } from "marked";
+import { MarkedSetupService } from "./marked-setup.service.js";
+import { MarkedContentHighlighter } from "./marked-content-highlighter.js";
 export type WithMarkedOptions = {
-    mangle?: boolean;
-    extensions?: MarkedExtension[];
+	mangle?: boolean;
+	extensions?: MarkedExtension[];
 };
 export declare function getMarkedSetup(options?: WithMarkedOptions, highlighter?: MarkedContentHighlighter): MarkedSetupService;

package/src/lib/content/marked/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../../../../../packages/platform/src/lib/content/marked/index.ts"],"sourcesContent":["import { MarkedExtension } from 'marked';\nimport { MarkedSetupService } from './marked-setup.service.js';\nimport { MarkedContentHighlighter } from './marked-content-highlighter.js';\n\nexport type WithMarkedOptions = {\n  mangle?: boolean;\n  extensions?: MarkedExtension[];\n};\n\nlet markedSetupInstance: MarkedSetupService;\n\nexport function getMarkedSetup(\n  options?: WithMarkedOptions,\n  highlighter?: MarkedContentHighlighter,\n): MarkedSetupService {\n  markedSetupInstance ??= new MarkedSetupService(options, highlighter);\n  return markedSetupInstance;\n}\n"],"mappings":";;AASA,IAAI;AAEJ,SAAgB,eACd,SACA,aACoB;AACpB,yBAAwB,IAAI,mBAAmB,SAAS,YAAY;AACpE,QAAO"}
+{"version":3,"file":"index.js","names":[],"sources":["../../../../../src/lib/content/marked/index.ts"],"sourcesContent":["import { MarkedExtension } from 'marked';\nimport { MarkedSetupService } from './marked-setup.service.js';\nimport { MarkedContentHighlighter } from './marked-content-highlighter.js';\n\nexport type WithMarkedOptions = {\n  mangle?: boolean;\n  extensions?: MarkedExtension[];\n};\n\nlet markedSetupInstance: MarkedSetupService;\n\nexport function getMarkedSetup(\n  options?: WithMarkedOptions,\n  highlighter?: MarkedContentHighlighter,\n): MarkedSetupService {\n  markedSetupInstance ??= new MarkedSetupService(options, highlighter);\n  return markedSetupInstance;\n}\n"],"mappings":";;AASA,IAAI;AAEJ,SAAgB,eACd,SACA,aACoB;AACpB,yBAAwB,IAAI,mBAAmB,SAAS,YAAY;AACpE,QAAO"}

package/src/lib/content/marked/marked-content-highlighter.d.ts

@@ -1,4 +1,4 @@
 export declare abstract class MarkedContentHighlighter {
-    augmentCodeBlock?(code: string, lang: string): string;
-    abstract getHighlightExtension(): import('marked').MarkedExtension;
+	augmentCodeBlock?(code: string, lang: string): string;
+	abstract getHighlightExtension(): import("marked").MarkedExtension;
 }

package/src/lib/content/marked/marked-content-highlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"marked-content-highlighter.js","names":[],"sources":["../../../../../../../packages/platform/src/lib/content/marked/marked-content-highlighter.ts"],"sourcesContent":["export abstract class MarkedContentHighlighter {\n  augmentCodeBlock?(code: string, lang: string): string;\n  abstract getHighlightExtension(): import('marked').MarkedExtension;\n}\n"],"mappings":";AAAA,IAAsB,2BAAtB,MAA+C"}
+{"version":3,"file":"marked-content-highlighter.js","names":[],"sources":["../../../../../src/lib/content/marked/marked-content-highlighter.ts"],"sourcesContent":["export abstract class MarkedContentHighlighter {\n  augmentCodeBlock?(code: string, lang: string): string;\n  abstract getHighlightExtension(): import('marked').MarkedExtension;\n}\n"],"mappings":";AAAA,IAAsB,2BAAtB,MAA+C"}

package/src/lib/content/marked/marked-setup.service.d.ts

@@ -1,10 +1,10 @@
-import { marked } from 'marked';
-import { MarkedContentHighlighter } from './marked-content-highlighter.js';
-import { WithMarkedOptions } from './index.js';
+import { marked } from "marked";
+import { MarkedContentHighlighter } from "./marked-content-highlighter.js";
+import { WithMarkedOptions } from "./index.js";
 export declare class MarkedSetupService {
-    private readonly options?;
-    private readonly highlighter?;
-    private readonly marked;
-    constructor(options?: WithMarkedOptions | undefined, highlighter?: MarkedContentHighlighter | undefined);
-    getMarkedInstance(): typeof marked;
+	private readonly options?;
+	private readonly highlighter?;
+	private readonly marked;
+	constructor(options?: WithMarkedOptions | undefined, highlighter?: MarkedContentHighlighter | undefined);
+	getMarkedInstance(): typeof marked;
 }

package/src/lib/content/marked/marked-setup.service.js

@@ -1,3 +1,4 @@
+import { escapeHtml, sanitizeLanguage } from "../utils/escape-html.js";
 import { marked } from "marked";
 import { gfmHeadingId } from "marked-gfm-heading-id";
 import { mangle } from "marked-mangle";
@@ -13,13 +14,14 @@ var MarkedSetupService = class {
 				breaks: false,
 				renderer: {
 					code({ text, lang }) {
-						if (lang === "mermaid") return "<pre class=\"mermaid\">" + text + "</pre>";
-						if (!lang) return "<pre><code>" + text + "</code></pre>";
-						if (highlighter?.augmentCodeBlock) return highlighter?.augmentCodeBlock(text, lang);
-						return `<pre class="language-${lang}"><code class="language-${lang}">${text}</code></pre>`;
+						const language = sanitizeLanguage(lang);
+						if (language === "mermaid") return "<pre class=\"mermaid\">" + escapeHtml(text) + "</pre>";
+						if (!language) return "<pre><code>" + escapeHtml(text) + "</code></pre>";
+						if (highlighter?.augmentCodeBlock) return highlighter?.augmentCodeBlock(text, language);
+						return `<pre class="language-${language}"><code class="language-${language}">${escapeHtml(text)}</code></pre>`;
 					},
 					codespan({ text }) {
-						return `<code>${text}</code>`;
+						return `<code>${escapeHtml(text)}</code>`;
 					},
 					paragraph({ tokens }) {
 						return `<p>${this.parser.parseInline(tokens)}</p>`;

package/src/lib/content/marked/marked-setup.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"marked-setup.service.js","names":[],"sources":["../../../../../../../packages/platform/src/lib/content/marked/marked-setup.service.ts"],"sourcesContent":["import { marked, Parser, MarkedExtension } from 'marked';\nimport { gfmHeadingId } from 'marked-gfm-heading-id';\nimport { mangle } from 'marked-mangle';\n\nimport { MarkedContentHighlighter } from './marked-content-highlighter.js';\nimport { WithMarkedOptions } from './index.js';\n\nexport class MarkedSetupService {\n  private readonly marked: typeof marked;\n\n  constructor(\n    private readonly options?: WithMarkedOptions | undefined,\n    private readonly highlighter?: MarkedContentHighlighter | undefined,\n  ) {\n    const analogMarkedExtension: MarkedExtension = {\n      pedantic: false,\n      gfm: true,\n      breaks: false,\n      renderer: {\n        code({ text, lang }) {\n          // Let's do a language based detection like on GitHub\n          // So we can still have non-interpreted mermaid code\n          if (lang === 'mermaid') {\n            return '<pre class=\"mermaid\">' + text + '</pre>';\n          }\n\n          if (!lang) {\n            return '<pre><code>' + text + '</code></pre>';\n          }\n\n          if (highlighter?.augmentCodeBlock) {\n            return highlighter?.augmentCodeBlock(text, lang);\n          }\n\n          return `<pre class=\"language-${lang}\"><code class=\"language-${lang}\">${text}</code></pre>`;\n        },\n        codespan({ text }) {\n          return `<code>${text}</code>`;\n        },\n        paragraph({ tokens }) {\n          const text = this.parser.parseInline(tokens);\n          return `<p>${text}</p>`;\n        },\n      },\n    };\n\n    const extensions = [\n      analogMarkedExtension,\n      gfmHeadingId(),\n      ...(options?.extensions || []),\n    ];\n\n    if (this.options?.mangle) {\n      extensions.push(mangle());\n    }\n\n    if (this.highlighter) {\n      extensions.push(this.highlighter.getHighlightExtension());\n    }\n\n    marked.use(...extensions);\n\n    this.marked = marked;\n  }\n\n  getMarkedInstance(): typeof marked {\n    return this.marked;\n  }\n}\n"],"mappings":";;;;AAOA,IAAa,qBAAb,MAAgC;CAG9B,YACE,SACA,aACA;AAFiB,OAAA,UAAA;AACA,OAAA,cAAA;EAkCjB,MAAM,aAAa;GAhC4B;IAC7C,UAAU;IACV,KAAK;IACL,QAAQ;IACR,UAAU;KACR,KAAK,EAAE,MAAM,QAAQ;AAGnB,UAAI,SAAS,UACX,QAAO,4BAA0B,OAAO;AAG1C,UAAI,CAAC,KACH,QAAO,gBAAgB,OAAO;AAGhC,UAAI,aAAa,iBACf,QAAO,aAAa,iBAAiB,MAAM,KAAK;AAGlD,aAAO,wBAAwB,KAAK,0BAA0B,KAAK,IAAI,KAAK;;KAE9E,SAAS,EAAE,QAAQ;AACjB,aAAO,SAAS,KAAK;;KAEvB,UAAU,EAAE,UAAU;AAEpB,aAAO,MADM,KAAK,OAAO,YAAY,OAAO,CAC1B;;KAErB;IACF;GAIC,cAAc;GACd,GAAI,SAAS,cAAc,EAAE;GAC9B;AAED,MAAI,KAAK,SAAS,OAChB,YAAW,KAAK,QAAQ,CAAC;AAG3B,MAAI,KAAK,YACP,YAAW,KAAK,KAAK,YAAY,uBAAuB,CAAC;AAG3D,SAAO,IAAI,GAAG,WAAW;AAEzB,OAAK,SAAS;;CAGhB,oBAAmC;AACjC,SAAO,KAAK"}
+{"version":3,"file":"marked-setup.service.js","names":[],"sources":["../../../../../src/lib/content/marked/marked-setup.service.ts"],"sourcesContent":["import { marked, Parser, MarkedExtension } from 'marked';\nimport { gfmHeadingId } from 'marked-gfm-heading-id';\nimport { mangle } from 'marked-mangle';\n\nimport { MarkedContentHighlighter } from './marked-content-highlighter.js';\nimport { WithMarkedOptions } from './index.js';\nimport { escapeHtml, sanitizeLanguage } from '../utils/escape-html.js';\n\nexport class MarkedSetupService {\n  private readonly marked: typeof marked;\n\n  constructor(\n    private readonly options?: WithMarkedOptions | undefined,\n    private readonly highlighter?: MarkedContentHighlighter | undefined,\n  ) {\n    const analogMarkedExtension: MarkedExtension = {\n      pedantic: false,\n      gfm: true,\n      breaks: false,\n      renderer: {\n        code({ text, lang }) {\n          // Let's do a language based detection like on GitHub\n          // So we can still have non-interpreted mermaid code\n          const language = sanitizeLanguage(lang);\n          if (language === 'mermaid') {\n            return '<pre class=\"mermaid\">' + escapeHtml(text) + '</pre>';\n          }\n\n          if (!language) {\n            return '<pre><code>' + escapeHtml(text) + '</code></pre>';\n          }\n\n          if (highlighter?.augmentCodeBlock) {\n            return highlighter?.augmentCodeBlock(text, language);\n          }\n\n          return `<pre class=\"language-${language}\"><code class=\"language-${language}\">${escapeHtml(text)}</code></pre>`;\n        },\n        codespan({ text }) {\n          return `<code>${escapeHtml(text)}</code>`;\n        },\n        paragraph({ tokens }) {\n          const text = this.parser.parseInline(tokens);\n          return `<p>${text}</p>`;\n        },\n      },\n    };\n\n    const extensions = [\n      analogMarkedExtension,\n      gfmHeadingId(),\n      ...(options?.extensions || []),\n    ];\n\n    if (this.options?.mangle) {\n      extensions.push(mangle());\n    }\n\n    if (this.highlighter) {\n      extensions.push(this.highlighter.getHighlightExtension());\n    }\n\n    marked.use(...extensions);\n\n    this.marked = marked;\n  }\n\n  getMarkedInstance(): typeof marked {\n    return this.marked;\n  }\n}\n"],"mappings":";;;;;AAQA,IAAa,qBAAb,MAAgC;CAG9B,YACE,SACA,aACA;AAFiB,OAAA,UAAA;AACA,OAAA,cAAA;EAmCjB,MAAM,aAAa;GAjC4B;IAC7C,UAAU;IACV,KAAK;IACL,QAAQ;IACR,UAAU;KACR,KAAK,EAAE,MAAM,QAAQ;MAGnB,MAAM,WAAW,iBAAiB,KAAK;AACvC,UAAI,aAAa,UACf,QAAO,4BAA0B,WAAW,KAAK,GAAG;AAGtD,UAAI,CAAC,SACH,QAAO,gBAAgB,WAAW,KAAK,GAAG;AAG5C,UAAI,aAAa,iBACf,QAAO,aAAa,iBAAiB,MAAM,SAAS;AAGtD,aAAO,wBAAwB,SAAS,0BAA0B,SAAS,IAAI,WAAW,KAAK,CAAC;;KAElG,SAAS,EAAE,QAAQ;AACjB,aAAO,SAAS,WAAW,KAAK,CAAC;;KAEnC,UAAU,EAAE,UAAU;AAEpB,aAAO,MADM,KAAK,OAAO,YAAY,OAAO,CAC1B;;KAErB;IACF;GAIC,cAAc;GACd,GAAI,SAAS,cAAc,EAAE;GAC9B;AAED,MAAI,KAAK,SAAS,OAChB,YAAW,KAAK,QAAQ,CAAC;AAG3B,MAAI,KAAK,YACP,YAAW,KAAK,KAAK,YAAY,uBAAuB,CAAC;AAG3D,SAAO,IAAI,GAAG,WAAW;AAEzB,OAAK,SAAS;;CAGhB,oBAAmC;AACjC,SAAO,KAAK"}

package/src/lib/content/prism/angular.js.map

@@ -1 +1 @@
-{"version":3,"file":"angular.js","names":[],"sources":["../../../../../../../packages/platform/src/lib/content/prism/angular.ts"],"sourcesContent":["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"],"mappings":";;CAEC,WAAY;AACX,KAAI,OAAO,UAAU,YACnB;AAGF,OAAM,UAAU,aAAa,MAAM,UAAU,OAAO,UAAU;EAC5D,SACE;EACF,UAAU;EACV,QAAQ;GACN,SAAS;GACT,YAAY;GACb;EACD,SAAS,EACP,SACE,uEACH;EACD,UACE;EACH,CAAC;AAEF,OAAM,UAAU,QAAQ,MAAM,UAAU;IACtC"}
+{"version":3,"file":"angular.js","names":[],"sources":["../../../../../src/lib/content/prism/angular.ts"],"sourcesContent":["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"],"mappings":";;CAEC,WAAY;AACX,KAAI,OAAO,UAAU,YACnB;AAGF,OAAM,UAAU,aAAa,MAAM,UAAU,OAAO,UAAU;EAC5D,SACE;EACF,UAAU;EACV,QAAQ;GACN,SAAS;GACT,YAAY;GACb;EACD,SAAS,EACP,SACE,uEACH;EACD,UACE;EACH,CAAC;AAEF,OAAM,UAAU,QAAQ,MAAM,UAAU;IACtC"}

package/src/lib/content/prism/index.d.ts

@@ -1,3 +1,3 @@
-import { PrismHighlighter } from './prism-highlighter.js';
+import { PrismHighlighter } from "./prism-highlighter.js";
 export { PrismHighlighter };
 export declare function getPrismHighlighter(): PrismHighlighter;

package/src/lib/content/prism/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../../../../../packages/platform/src/lib/content/prism/index.ts"],"sourcesContent":["import { PrismHighlighter } from './prism-highlighter.js';\n\nexport { PrismHighlighter };\n\nlet highlighterInstance: PrismHighlighter;\n\nexport function getPrismHighlighter(): PrismHighlighter {\n  highlighterInstance ??= new PrismHighlighter();\n  return highlighterInstance;\n}\n"],"mappings":";;AAIA,IAAI;AAEJ,SAAgB,sBAAwC;AACtD,yBAAwB,IAAI,kBAAkB;AAC9C,QAAO"}
+{"version":3,"file":"index.js","names":[],"sources":["../../../../../src/lib/content/prism/index.ts"],"sourcesContent":["import { PrismHighlighter } from './prism-highlighter.js';\n\nexport { PrismHighlighter };\n\nlet highlighterInstance: PrismHighlighter;\n\nexport function getPrismHighlighter(): PrismHighlighter {\n  highlighterInstance ??= new PrismHighlighter();\n  return highlighterInstance;\n}\n"],"mappings":";;AAIA,IAAI;AAEJ,SAAgB,sBAAwC;AACtD,yBAAwB,IAAI,kBAAkB;AAC9C,QAAO"}

package/src/lib/content/prism/options.d.ts

@@ -1,3 +1,3 @@
 export type WithPrismHighlighterOptions = {
-    additionalLangs?: string[];
+	additionalLangs?: string[];
 };

package/src/lib/content/prism/prism-highlighter.d.ts

@@ -1,7 +1,7 @@
-import 'prismjs';
-import './angular.js';
-import { MarkedContentHighlighter } from '../marked/marked-content-highlighter.js';
+import "prismjs";
+import "./angular.js";
+import { MarkedContentHighlighter } from "../marked/marked-content-highlighter.js";
 export declare class PrismHighlighter extends MarkedContentHighlighter {
-    augmentCodeBlock(code: string, lang: string): string;
-    getHighlightExtension(): import('marked').MarkedExtension;
+	override augmentCodeBlock(code: string, lang: string): string;
+	override getHighlightExtension(): import("marked").MarkedExtension;
 }

package/src/lib/content/prism/prism-highlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"prism-highlighter.js","names":[],"sources":["../../../../../../../packages/platform/src/lib/content/prism/prism-highlighter.ts"],"sourcesContent":["import { markedHighlight } from 'marked-highlight';\n\nimport 'prismjs';\nimport './angular.js';\n\nimport { MarkedContentHighlighter } from '../marked/marked-content-highlighter.js';\n\ndeclare const Prism: typeof import('prismjs');\n\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\n    To enable, add it to the \\`analog\\` plugin in your \\`vite.config.ts\\`:\n      analog({\n        content: {\n          prismOptions: {\n            additionalLangs: [\n              'prism-diff'\n            ]\n          }\n        }\n      })\n\n    Add the plugin import to your \\`app.config.ts\\`\n    import 'prismjs/plugins/diff-highlight/prism-diff-highlight.js';\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, add it to the \\`analog\\` plugin in your \\`vite.config.ts\\`:\n      analog({\n        content: {\n          prismOptions: {\n            additionalLangs: [\n              '${lang}',\n            ]\n          }\n        }\n      })\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    });\n  }\n}\n"],"mappings":";;;;;AASA,IAAa,mBAAb,cAAsC,yBAAyB;CAC7D,iBAA0B,MAAc,MAAsB;EAC5D,MAAM,UACJ,KAAK,WAAW,OAAO,IAAI,MAAM,UAAU,UACvC,YAAY,KAAK,mBACjB,YAAY,KAAK,QAAQ,SAAS,GAAG;AAC3C,SAAO,eAAe,QAAQ,iBAAiB,QAAQ,IAAI,KAAK;;CAGlE,wBAAmE;AACjE,SAAO,gBAAgB;GACrB,OAAO;GACP,YAAY,MAAc,SAAiB;IACzC,IAAI,OAAO,MAAM,WAAW,QAAQ;AACpC,WAAO,OAAO,KAAK,QAAQ,SAAS,GAAG,GAAG,QAAQ;AAElD,QAAI,QAAQ,CAAC,MAAM,UAAU,SAAS;AACpC,YAAO;AACP,aAAQ,KAAK;;;;;;;;;;;;;;;;;;cAkBT;;AAGN,QAAI,CAAC,MAAM,UAAU,OAAO;AAC1B,SAAI,SAAS,UACX,SAAQ,KAAK;;8BAEK,KAAK;;;;;;iBAMlB,KAAK;;;;;;gBAMN;AAEN,YAAO;;AAET,WAAO,MAAM,UACX,MACA,OAAO,MAAM,UAAU,UAAU,MAAM,UAAU,OACjD,KACD;;GAEJ,CAAC"}
+{"version":3,"file":"prism-highlighter.js","names":[],"sources":["../../../../../src/lib/content/prism/prism-highlighter.ts"],"sourcesContent":["import { markedHighlight } from 'marked-highlight';\n\nimport 'prismjs';\nimport './angular.js';\n\nimport { MarkedContentHighlighter } from '../marked/marked-content-highlighter.js';\n\ndeclare const Prism: typeof import('prismjs');\n\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\n    To enable, add it to the \\`analog\\` plugin in your \\`vite.config.ts\\`:\n      analog({\n        content: {\n          prismOptions: {\n            additionalLangs: [\n              'prism-diff'\n            ]\n          }\n        }\n      })\n\n    Add the plugin import to your \\`app.config.ts\\`\n    import 'prismjs/plugins/diff-highlight/prism-diff-highlight.js';\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, add it to the \\`analog\\` plugin in your \\`vite.config.ts\\`:\n      analog({\n        content: {\n          prismOptions: {\n            additionalLangs: [\n              '${lang}',\n            ]\n          }\n        }\n      })\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    });\n  }\n}\n"],"mappings":";;;;;AASA,IAAa,mBAAb,cAAsC,yBAAyB;CAC7D,iBAA0B,MAAc,MAAsB;EAC5D,MAAM,UACJ,KAAK,WAAW,OAAO,IAAI,MAAM,UAAU,UACvC,YAAY,KAAK,mBACjB,YAAY,KAAK,QAAQ,SAAS,GAAG;AAC3C,SAAO,eAAe,QAAQ,iBAAiB,QAAQ,IAAI,KAAK;;CAGlE,wBAAmE;AACjE,SAAO,gBAAgB;GACrB,OAAO;GACP,YAAY,MAAc,SAAiB;IACzC,IAAI,OAAO,MAAM,WAAW,QAAQ;AACpC,WAAO,OAAO,KAAK,QAAQ,SAAS,GAAG,GAAG,QAAQ;AAElD,QAAI,QAAQ,CAAC,MAAM,UAAU,SAAS;AACpC,YAAO;AACP,aAAQ,KAAK;;;;;;;;;;;;;;;;;;cAkBT;;AAGN,QAAI,CAAC,MAAM,UAAU,OAAO;AAC1B,SAAI,SAAS,UACX,SAAQ,KAAK;;8BAEK,KAAK;;;;;;iBAMlB,KAAK;;;;;;gBAMN;AAEN,YAAO;;AAET,WAAO,MAAM,UACX,MACA,OAAO,MAAM,UAAU,UAAU,MAAM,UAAU,OACjD,KACD;;GAEJ,CAAC"}

package/src/lib/content/shiki/index.d.ts

@@ -1,4 +1,4 @@
-import { WithShikiHighlighterOptions } from './options.js';
-import { ShikiHighlighter } from './shiki-highlighter.js';
+import { WithShikiHighlighterOptions } from "./options.js";
+import { ShikiHighlighter } from "./shiki-highlighter.js";
 export { ShikiHighlighter };
-export declare function getShikiHighlighter({ highlighter, highlight, container, }?: WithShikiHighlighterOptions): ShikiHighlighter;
+export declare function getShikiHighlighter({ highlighter, highlight, container }?: WithShikiHighlighterOptions): ShikiHighlighter;

package/src/lib/content/shiki/index.js

@@ -3,15 +3,18 @@ import { ShikiHighlighter, defaultHighlighterOptions } from "./shiki-highlighter
 var highlighterInstance;
 function getShikiHighlighter({ highlighter = {}, highlight = {}, container = "%s" } = {}) {
 	if (highlighterInstance) return highlighterInstance;
+	const additionalLangs = highlighter.additionalLangs ?? [];
+	const skipLangs = highlighter.skipLangs ?? [];
+	const hasMermaidSupport = highlighter.langs?.includes("mermaid") || additionalLangs.includes("mermaid");
 	if (!highlighter.themes) if (highlight.theme) highlighter.themes = [highlight.theme];
 	else if (highlight.themes && typeof highlight.themes === "object") highlighter.themes = Object.values(highlight.themes);
 	else highlighter.themes = defaultHighlighterOptions.themes;
-	if (!highlighter.langs) highlighter.langs = defaultHighlighterOptions.langs;
-	if (highlighter.additionalLangs) {
-		highlighter.langs.push(...highlighter.additionalLangs);
-		delete highlighter.additionalLangs;
-	}
-	highlighterInstance = new ShikiHighlighter(highlighter, highlight, container, !!highlighter.langs.includes("mermaid"));
+	if (!highlighter.langs) highlighter.langs = [...defaultHighlighterOptions.langs];
+	if (additionalLangs.length > 0) highlighter.langs.push(...additionalLangs);
+	if (skipLangs.length > 0) highlighter.langs = highlighter.langs.filter((lang) => !skipLangs.includes(lang));
+	delete highlighter.additionalLangs;
+	delete highlighter.skipLangs;
+	highlighterInstance = new ShikiHighlighter(highlighter, highlight, container, hasMermaidSupport, skipLangs);
 	return highlighterInstance;
 }
 //#endregion

package/src/lib/content/shiki/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../../../../../packages/platform/src/lib/content/shiki/index.ts"],"sourcesContent":["import { WithShikiHighlighterOptions } from './options.js';\nimport {\n  defaultHighlighterOptions,\n  ShikiHighlighter,\n  ShikiHighlighterOptions,\n} from './shiki-highlighter.js';\n\nexport { ShikiHighlighter };\n\nlet highlighterInstance: ShikiHighlighter;\n\nexport function getShikiHighlighter({\n  highlighter = {},\n  highlight = {},\n  container = '%s',\n}: WithShikiHighlighterOptions = {}): ShikiHighlighter {\n  if (highlighterInstance) {\n    return highlighterInstance;\n  }\n\n  if (!highlighter.themes) {\n    if (highlight.theme) {\n      highlighter.themes = [highlight.theme];\n    } else if (highlight.themes && typeof highlight.themes === 'object') {\n      highlighter.themes = Object.values(highlight.themes) as string[];\n    } else {\n      highlighter.themes = defaultHighlighterOptions.themes;\n    }\n  }\n\n  if (!highlighter.langs) {\n    highlighter.langs = defaultHighlighterOptions.langs;\n  }\n\n  if (highlighter.additionalLangs) {\n    highlighter.langs.push(...highlighter.additionalLangs);\n    delete highlighter.additionalLangs;\n  }\n\n  highlighterInstance = new ShikiHighlighter(\n    highlighter as ShikiHighlighterOptions,\n    highlight,\n    container,\n    !!highlighter.langs.includes('mermaid'),\n  );\n\n  return highlighterInstance;\n}\n"],"mappings":";;AASA,IAAI;AAEJ,SAAgB,oBAAoB,EAClC,cAAc,EAAE,EAChB,YAAY,EAAE,EACd,YAAY,SACmB,EAAE,EAAoB;AACrD,KAAI,oBACF,QAAO;AAGT,KAAI,CAAC,YAAY,OACf,KAAI,UAAU,MACZ,aAAY,SAAS,CAAC,UAAU,MAAM;UAC7B,UAAU,UAAU,OAAO,UAAU,WAAW,SACzD,aAAY,SAAS,OAAO,OAAO,UAAU,OAAO;KAEpD,aAAY,SAAS,0BAA0B;AAInD,KAAI,CAAC,YAAY,MACf,aAAY,QAAQ,0BAA0B;AAGhD,KAAI,YAAY,iBAAiB;AAC/B,cAAY,MAAM,KAAK,GAAG,YAAY,gBAAgB;AACtD,SAAO,YAAY;;AAGrB,uBAAsB,IAAI,iBACxB,aACA,WACA,WACA,CAAC,CAAC,YAAY,MAAM,SAAS,UAAU,CACxC;AAED,QAAO"}
+{"version":3,"file":"index.js","names":[],"sources":["../../../../../src/lib/content/shiki/index.ts"],"sourcesContent":["import { WithShikiHighlighterOptions } from './options.js';\nimport {\n  defaultHighlighterOptions,\n  ShikiHighlighter,\n  ShikiHighlighterOptions,\n} from './shiki-highlighter.js';\n\nexport { ShikiHighlighter };\n\nlet highlighterInstance: ShikiHighlighter;\n\nexport function getShikiHighlighter({\n  highlighter = {},\n  highlight = {},\n  container = '%s',\n}: WithShikiHighlighterOptions = {}): ShikiHighlighter {\n  if (highlighterInstance) {\n    return highlighterInstance;\n  }\n\n  const additionalLangs = highlighter.additionalLangs ?? [];\n  const skipLangs = highlighter.skipLangs ?? [];\n  const hasMermaidSupport =\n    highlighter.langs?.includes('mermaid') ||\n    additionalLangs.includes('mermaid');\n\n  if (!highlighter.themes) {\n    if (highlight.theme) {\n      highlighter.themes = [highlight.theme];\n    } else if (highlight.themes && typeof highlight.themes === 'object') {\n      highlighter.themes = Object.values(highlight.themes) as string[];\n    } else {\n      highlighter.themes = defaultHighlighterOptions.themes;\n    }\n  }\n\n  if (!highlighter.langs) {\n    highlighter.langs = [...defaultHighlighterOptions.langs];\n  }\n\n  if (additionalLangs.length > 0) {\n    highlighter.langs.push(...additionalLangs);\n  }\n\n  if (skipLangs.length > 0) {\n    highlighter.langs = highlighter.langs.filter(\n      (lang) => !skipLangs.includes(lang),\n    );\n  }\n\n  delete highlighter.additionalLangs;\n  delete highlighter.skipLangs;\n\n  highlighterInstance = new ShikiHighlighter(\n    highlighter as ShikiHighlighterOptions,\n    highlight,\n    container,\n    hasMermaidSupport,\n    skipLangs,\n  );\n\n  return highlighterInstance;\n}\n"],"mappings":";;AASA,IAAI;AAEJ,SAAgB,oBAAoB,EAClC,cAAc,EAAE,EAChB,YAAY,EAAE,EACd,YAAY,SACmB,EAAE,EAAoB;AACrD,KAAI,oBACF,QAAO;CAGT,MAAM,kBAAkB,YAAY,mBAAmB,EAAE;CACzD,MAAM,YAAY,YAAY,aAAa,EAAE;CAC7C,MAAM,oBACJ,YAAY,OAAO,SAAS,UAAU,IACtC,gBAAgB,SAAS,UAAU;AAErC,KAAI,CAAC,YAAY,OACf,KAAI,UAAU,MACZ,aAAY,SAAS,CAAC,UAAU,MAAM;UAC7B,UAAU,UAAU,OAAO,UAAU,WAAW,SACzD,aAAY,SAAS,OAAO,OAAO,UAAU,OAAO;KAEpD,aAAY,SAAS,0BAA0B;AAInD,KAAI,CAAC,YAAY,MACf,aAAY,QAAQ,CAAC,GAAG,0BAA0B,MAAM;AAG1D,KAAI,gBAAgB,SAAS,EAC3B,aAAY,MAAM,KAAK,GAAG,gBAAgB;AAG5C,KAAI,UAAU,SAAS,EACrB,aAAY,QAAQ,YAAY,MAAM,QACnC,SAAS,CAAC,UAAU,SAAS,KAAK,CACpC;AAGH,QAAO,YAAY;AACnB,QAAO,YAAY;AAEnB,uBAAsB,IAAI,iBACxB,aACA,WACA,WACA,mBACA,UACD;AAED,QAAO"}

package/src/lib/content/shiki/options.d.ts

@@ -1,9 +1,10 @@
-import { ShikiHighlighterOptions, ShikiHighlightOptions } from './shiki-highlighter.js';
-import { BundledLanguage } from 'shiki/langs';
+import { ShikiHighlighterOptions, ShikiHighlightOptions } from "./shiki-highlighter.js";
+import { BundledLanguage } from "shiki/langs";
 export interface WithShikiHighlighterOptions {
-    highlighter?: Partial<ShikiHighlighterOptions> & {
-        additionalLangs?: BundledLanguage[];
-    };
-    highlight?: ShikiHighlightOptions;
-    container?: string;
+	highlighter?: Partial<ShikiHighlighterOptions> & {
+		additionalLangs?: BundledLanguage[];
+		skipLangs?: BundledLanguage[];
+	};
+	highlight?: ShikiHighlightOptions;
+	container?: string;
 }

package/src/lib/content/shiki/shiki-highlighter.d.ts

@@ -1,17 +1,18 @@
-import { type BundledLanguage, type BundledTheme, type CodeOptionsMeta, type CodeOptionsMultipleThemes, type CodeOptionsSingleTheme, type CodeToHastOptionsCommon, getHighlighter } from 'shiki';
-import { MarkedContentHighlighter } from '../marked/marked-content-highlighter.js';
-export type ShikiHighlighterOptions = Parameters<typeof getHighlighter>[0];
-export type ShikiHighlightOptions = Partial<Omit<CodeToHastOptionsCommon<BundledLanguage>, 'lang'>> & CodeOptionsMeta & Partial<CodeOptionsSingleTheme<BundledTheme>> & Partial<CodeOptionsMultipleThemes<BundledTheme>>;
+import { type BundledLanguage, type BundledTheme, type CodeOptionsMeta, type CodeOptionsMultipleThemes, type CodeOptionsSingleTheme, type CodeToHastOptionsCommon, createHighlighter } from "shiki";
+import { MarkedContentHighlighter } from "../marked/marked-content-highlighter.js";
+export type ShikiHighlighterOptions = Parameters<typeof createHighlighter>[0];
+export type ShikiHighlightOptions = Partial<Omit<CodeToHastOptionsCommon<BundledLanguage>, "lang">> & CodeOptionsMeta & Partial<CodeOptionsSingleTheme<BundledTheme>> & Partial<CodeOptionsMultipleThemes<BundledTheme>>;
 export declare const defaultHighlighterOptions: {
-    langs: string[];
-    themes: string[];
+	langs: string[];
+	themes: string[];
 };
 export declare class ShikiHighlighter extends MarkedContentHighlighter {
-    private highlighterOptions;
-    private highlightOptions;
-    private container;
-    private hasLoadMermaid;
-    private readonly highlighter;
-    constructor(highlighterOptions: ShikiHighlighterOptions, highlightOptions: ShikiHighlightOptions, container: string, hasLoadMermaid?: boolean);
-    getHighlightExtension(): import('marked').MarkedExtension;
+	private highlighterOptions;
+	private highlightOptions;
+	private container;
+	private hasLoadMermaid;
+	private skipLangs;
+	private readonly highlighter;
+	constructor(highlighterOptions: ShikiHighlighterOptions, highlightOptions: ShikiHighlightOptions, container: string, hasLoadMermaid?: boolean, skipLangs?: string[]);
+	getHighlightExtension(): import("marked").MarkedExtension;
 }

package/src/lib/content/shiki/shiki-highlighter.js

@@ -1,6 +1,7 @@
+import { escapeHtml } from "../utils/escape-html.js";
 import { MarkedContentHighlighter } from "../marked/marked-content-highlighter.js";
 import markedShiki from "marked-shiki";
-import { getHighlighter } from "shiki";
+import { createHighlighter } from "shiki";
 //#region packages/platform/src/lib/content/shiki/shiki-highlighter.ts
 var defaultHighlighterOptions = {
 	langs: [
@@ -17,19 +18,21 @@ var defaultHighlighterOptions = {
 	themes: ["github-dark", "github-light"]
 };
 var ShikiHighlighter = class extends MarkedContentHighlighter {
-	constructor(highlighterOptions, highlightOptions, container, hasLoadMermaid = false) {
+	constructor(highlighterOptions, highlightOptions, container, hasLoadMermaid = false, skipLangs = []) {
 		super();
 		this.highlighterOptions = highlighterOptions;
 		this.highlightOptions = highlightOptions;
 		this.container = container;
 		this.hasLoadMermaid = hasLoadMermaid;
-		this.highlighter = getHighlighter(this.highlighterOptions);
+		this.skipLangs = skipLangs;
+		this.highlighter = createHighlighter(this.highlighterOptions);
 	}
 	getHighlightExtension() {
 		return markedShiki({
 			container: this.container,
 			highlight: async (code, lang, props) => {
-				if (this.hasLoadMermaid && lang === "mermaid") return `<pre class="mermaid">${code}</pre>`;
+				if (this.hasLoadMermaid && lang === "mermaid") return `<pre class="mermaid">${escapeHtml(code)}</pre>`;
+				if (this.skipLangs.includes(lang)) return `<pre class="language-${lang}"><code class="language-${lang}">${escapeHtml(code)}</code></pre>`;
 				const { codeToHtml } = await this.highlighter;
 				return codeToHtml(code, Object.assign({
 					lang,

package/src/lib/content/shiki/shiki-highlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"shiki-highlighter.js","names":[],"sources":["../../../../../../../packages/platform/src/lib/content/shiki/shiki-highlighter.ts"],"sourcesContent":["import markedShiki from 'marked-shiki';\nimport {\n  type BundledLanguage,\n  type BundledTheme,\n  type CodeOptionsMeta,\n  type CodeOptionsMultipleThemes,\n  type CodeOptionsSingleTheme,\n  type CodeToHastOptionsCommon,\n  getHighlighter,\n} from 'shiki';\n\nimport { MarkedContentHighlighter } from '../marked/marked-content-highlighter.js';\n\nexport type ShikiHighlighterOptions = Parameters<typeof getHighlighter>[0];\nexport type ShikiHighlightOptions = Partial<\n  Omit<CodeToHastOptionsCommon<BundledLanguage>, 'lang'>\n> &\n  CodeOptionsMeta &\n  Partial<CodeOptionsSingleTheme<BundledTheme>> &\n  Partial<CodeOptionsMultipleThemes<BundledTheme>>;\n\nexport const defaultHighlighterOptions: {\n  langs: string[];\n  themes: string[];\n} = {\n  langs: [\n    'json',\n    'ts',\n    'tsx',\n    'js',\n    'jsx',\n    'html',\n    'css',\n    'angular-html',\n    'angular-ts',\n  ],\n  themes: ['github-dark', 'github-light'],\n};\n\nexport class ShikiHighlighter extends MarkedContentHighlighter {\n  private readonly highlighter = getHighlighter(this.highlighterOptions);\n\n  constructor(\n    private highlighterOptions: ShikiHighlighterOptions,\n    private highlightOptions: ShikiHighlightOptions,\n    private container: string,\n    private hasLoadMermaid = false,\n  ) {\n    super();\n  }\n  getHighlightExtension(): import('marked').MarkedExtension {\n    return markedShiki({\n      container: this.container,\n      highlight: async (code, lang, props) => {\n        if (this.hasLoadMermaid && lang === 'mermaid') {\n          return `<pre class=\"mermaid\">${code}</pre>`;\n        }\n\n        const { codeToHtml } = await this.highlighter;\n        return codeToHtml(\n          code,\n          Object.assign(\n            {\n              lang,\n              // required by `transformerMeta*`\n              meta: { __raw: props.join(' ') },\n              theme: 'github-dark',\n            },\n            this.highlightOptions,\n          ),\n        );\n      },\n    });\n  }\n}\n"],"mappings":";;;;AAqBA,IAAa,4BAGT;CACF,OAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACD;CACD,QAAQ,CAAC,eAAe,eAAe;CACxC;AAED,IAAa,mBAAb,cAAsC,yBAAyB;CAG7D,YACE,oBACA,kBACA,WACA,iBAAyB,OACzB;AACA,SAAO;AALC,OAAA,qBAAA;AACA,OAAA,mBAAA;AACA,OAAA,YAAA;AACA,OAAA,iBAAA;qBANqB,eAAe,KAAK,mBAAmB;;CAUtE,wBAA0D;AACxD,SAAO,YAAY;GACjB,WAAW,KAAK;GAChB,WAAW,OAAO,MAAM,MAAM,UAAU;AACtC,QAAI,KAAK,kBAAkB,SAAS,UAClC,QAAO,wBAAwB,KAAK;IAGtC,MAAM,EAAE,eAAe,MAAM,KAAK;AAClC,WAAO,WACL,MACA,OAAO,OACL;KACE;KAEA,MAAM,EAAE,OAAO,MAAM,KAAK,IAAI,EAAE;KAChC,OAAO;KACR,EACD,KAAK,iBACN,CACF;;GAEJ,CAAC"}
+{"version":3,"file":"shiki-highlighter.js","names":[],"sources":["../../../../../src/lib/content/shiki/shiki-highlighter.ts"],"sourcesContent":["import markedShiki from 'marked-shiki';\nimport {\n  type BundledLanguage,\n  type BundledTheme,\n  type CodeOptionsMeta,\n  type CodeOptionsMultipleThemes,\n  type CodeOptionsSingleTheme,\n  type CodeToHastOptionsCommon,\n  createHighlighter,\n} from 'shiki';\n\nimport { MarkedContentHighlighter } from '../marked/marked-content-highlighter.js';\nimport { escapeHtml } from '../utils/escape-html.js';\n\nexport type ShikiHighlighterOptions = Parameters<typeof createHighlighter>[0];\nexport type ShikiHighlightOptions = Partial<\n  Omit<CodeToHastOptionsCommon<BundledLanguage>, 'lang'>\n> &\n  CodeOptionsMeta &\n  Partial<CodeOptionsSingleTheme<BundledTheme>> &\n  Partial<CodeOptionsMultipleThemes<BundledTheme>>;\n\nexport const defaultHighlighterOptions: {\n  langs: string[];\n  themes: string[];\n} = {\n  langs: [\n    'json',\n    'ts',\n    'tsx',\n    'js',\n    'jsx',\n    'html',\n    'css',\n    'angular-html',\n    'angular-ts',\n  ],\n  themes: ['github-dark', 'github-light'],\n};\n\nexport class ShikiHighlighter extends MarkedContentHighlighter {\n  private readonly highlighter: ReturnType<typeof createHighlighter>;\n\n  constructor(\n    private highlighterOptions: ShikiHighlighterOptions,\n    private highlightOptions: ShikiHighlightOptions,\n    private container: string,\n    private hasLoadMermaid = false,\n    private skipLangs: string[] = [],\n  ) {\n    super();\n    this.highlighter = createHighlighter(this.highlighterOptions);\n  }\n  getHighlightExtension(): import('marked').MarkedExtension {\n    return markedShiki({\n      container: this.container,\n      highlight: async (code, lang, props) => {\n        if (this.hasLoadMermaid && lang === 'mermaid') {\n          return `<pre class=\"mermaid\">${escapeHtml(code)}</pre>`;\n        }\n\n        if (this.skipLangs.includes(lang as string)) {\n          const escapedCode = escapeHtml(code);\n\n          return `<pre class=\"language-${lang}\"><code class=\"language-${lang}\">${escapedCode}</code></pre>`;\n        }\n\n        const { codeToHtml } = await this.highlighter;\n        return codeToHtml(\n          code,\n          Object.assign(\n            {\n              lang,\n              // required by `transformerMeta*`\n              meta: { __raw: props.join(' ') },\n              theme: 'github-dark',\n            },\n            this.highlightOptions,\n          ),\n        );\n      },\n    });\n  }\n}\n"],"mappings":";;;;;AAsBA,IAAa,4BAGT;CACF,OAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACD;CACD,QAAQ,CAAC,eAAe,eAAe;CACxC;AAED,IAAa,mBAAb,cAAsC,yBAAyB;CAG7D,YACE,oBACA,kBACA,WACA,iBAAyB,OACzB,YAA8B,EAAE,EAChC;AACA,SAAO;AANC,OAAA,qBAAA;AACA,OAAA,mBAAA;AACA,OAAA,YAAA;AACA,OAAA,iBAAA;AACA,OAAA,YAAA;AAGR,OAAK,cAAc,kBAAkB,KAAK,mBAAmB;;CAE/D,wBAA0D;AACxD,SAAO,YAAY;GACjB,WAAW,KAAK;GAChB,WAAW,OAAO,MAAM,MAAM,UAAU;AACtC,QAAI,KAAK,kBAAkB,SAAS,UAClC,QAAO,wBAAwB,WAAW,KAAK,CAAC;AAGlD,QAAI,KAAK,UAAU,SAAS,KAAe,CAGzC,QAAO,wBAAwB,KAAK,0BAA0B,KAAK,IAF/C,WAAW,KAAK,CAE+C;IAGrF,MAAM,EAAE,eAAe,MAAM,KAAK;AAClC,WAAO,WACL,MACA,OAAO,OACL;KACE;KAEA,MAAM,EAAE,OAAO,MAAM,KAAK,IAAI,EAAE;KAChC,OAAO;KACR,EACD,KAAK,iBACN,CACF;;GAEJ,CAAC"}

package/src/lib/content/utils/escape-html.d.ts

@@ -0,0 +1,7 @@
+export declare function escapeHtml(value: string): string;
+/**
+* Reduces a fenced code-block info string to a safe language identifier so it
+* cannot break out of the `class="language-..."` attribute it is interpolated
+* into.
+*/
+export declare function sanitizeLanguage(lang: string | undefined): string;

package/src/lib/content/utils/escape-html.js

@@ -0,0 +1,16 @@
+//#region packages/platform/src/lib/content/utils/escape-html.ts
+function escapeHtml(value) {
+	return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;").replaceAll("'", "&#39;");
+}
+/**
+* Reduces a fenced code-block info string to a safe language identifier so it
+* cannot break out of the `class="language-..."` attribute it is interpolated
+* into.
+*/
+function sanitizeLanguage(lang) {
+	return (lang ?? "").match(/^[a-zA-Z0-9-+#.]*/)?.[0] ?? "";
+}
+//#endregion
+export { escapeHtml, sanitizeLanguage };
+
+//# sourceMappingURL=escape-html.js.map

package/src/lib/content/utils/escape-html.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"escape-html.js","names":[],"sources":["../../../../../src/lib/content/utils/escape-html.ts"],"sourcesContent":["export function escapeHtml(value: string): string {\n  return value\n    .replaceAll('&', '&amp;')\n    .replaceAll('<', '&lt;')\n    .replaceAll('>', '&gt;')\n    .replaceAll('\"', '&quot;')\n    .replaceAll(\"'\", '&#39;');\n}\n\n/**\n * Reduces a fenced code-block info string to a safe language identifier so it\n * cannot break out of the `class=\"language-...\"` attribute it is interpolated\n * into.\n */\nexport function sanitizeLanguage(lang: string | undefined): string {\n  return (lang ?? '').match(/^[a-zA-Z0-9-+#.]*/)?.[0] ?? '';\n}\n"],"mappings":";AAAA,SAAgB,WAAW,OAAuB;AAChD,QAAO,MACJ,WAAW,KAAK,QAAQ,CACxB,WAAW,KAAK,OAAO,CACvB,WAAW,KAAK,OAAO,CACvB,WAAW,MAAK,SAAS,CACzB,WAAW,KAAK,QAAQ;;;;;;;AAQ7B,SAAgB,iBAAiB,MAAkC;AACjE,SAAQ,QAAQ,IAAI,MAAM,oBAAoB,GAAG,MAAM"}