@fraqjs/plugin-takumi 0.1.1 → 0.1.3

package/dist/index.d.mts

@@ -7,6 +7,7 @@ import { ReactNode } from "react";
 //#region src/service.d.ts
 interface TakumiServiceOptions {
   renderer?: ConstructRendererOptions;
+  renderDefaults?: RenderOptions;
   onFontRegisterConflict?: 'error' | 'warn-and-ignore' | 'warn-and-replace';
 }
 interface PathBasedFontDetails {
@@ -16,17 +17,19 @@ interface PathBasedFontDetails {
   style?: 'normal' | 'italic' | 'oblique' | `oblique ${number}deg` | (string & {});
 }
 declare class TakumiService implements Disposable {
-  private readonly ctx;
+  private readonly options?;
+  private readonly ctx?;
   readonly renderer: Renderer;
   private readonly abortController;
   private readonly registeredFontFamilies;
   private onFontRegisterConflict;
-  constructor(ctx: Context, options: TakumiServiceOptions);
+  constructor(options?: TakumiServiceOptions | undefined, ctx?: Context | undefined);
   registerFontFamily(family: string, fonts: (string | PathBasedFontDetails | Font)[], signal?: AbortSignal): Promise<void>;
   renderJsx(jsx: ReactNode | ReactElementLike, renderOptions?: RenderOptions, signal?: AbortSignal): Promise<Buffer>;
   renderJsxWithEmoji(jsx: ReactNode | ReactElementLike, renderOptions?: RenderOptions, signal?: AbortSignal, emojiType?: EmojiType): Promise<Buffer>;
   renderHtml(html: string, renderOptions?: RenderOptions, signal?: AbortSignal): Promise<Buffer>;
   renderHtmlWithEmoji(html: string, renderOptions?: RenderOptions, signal?: AbortSignal, emojiType?: EmojiType): Promise<Buffer>;
+  private mergeRenderOptions;
   private processEmoji;
   dispose(): void;
 }
@@ -35,6 +38,7 @@ declare class TakumiService implements Disposable {
 interface TakumiPluginOptions extends TakumiServiceOptions {
   loadBuiltinFonts?: boolean;
 }
+declare function loadBuiltinFontsForService(service: TakumiService): Promise<void>;
 declare const TakumiPlugin: import("@fraqjs/fraq").Plugin<[options?: TakumiPluginOptions | undefined], import("@fraqjs/fraq").Injection | undefined, import("@fraqjs/fraq").Injection | undefined>;
 //#endregion
-export { PathBasedFontDetails, TakumiPlugin, TakumiPlugin as default, TakumiPluginOptions, TakumiService, TakumiServiceOptions };
+export { PathBasedFontDetails, TakumiPlugin, TakumiPlugin as default, TakumiPluginOptions, TakumiService, TakumiServiceOptions, loadBuiltinFontsForService };

package/dist/index.mjs

@@ -7,35 +7,32 @@ import { fromHtml } from "@takumi-rs/helpers/html";
 import { fromJsx } from "@takumi-rs/helpers/jsx";
 import fs from "node:fs/promises";
 //#region src/service.ts
-function withMergedStylesheets(stylesheets, renderOptions) {
-	const extraStylesheets = renderOptions?.stylesheets ?? [];
-	return {
-		...renderOptions,
-		stylesheets: [...stylesheets, ...extraStylesheets]
-	};
-}
 function combineAbortSignals(...signals) {
 	return AbortSignal.any(signals.filter((signal) => signal !== void 0));
 }
 var TakumiService = class {
+	options;
 	ctx;
 	renderer;
 	abortController = new AbortController();
 	registeredFontFamilies = /* @__PURE__ */ new Set();
 	onFontRegisterConflict;
-	constructor(ctx, options) {
+	constructor(options, ctx) {
+		this.options = options;
 		this.ctx = ctx;
-		this.renderer = new Renderer(options.renderer);
-		this.onFontRegisterConflict = options.onFontRegisterConflict ?? "warn-and-ignore";
+		this.renderer = new Renderer(options?.renderer);
+		this.onFontRegisterConflict = options?.onFontRegisterConflict ?? "warn-and-ignore";
 	}
 	async registerFontFamily(family, fonts, signal) {
 		if (this.registeredFontFamilies.has(family)) {
 			const message = `Font family "${family}" has already been registered.`;
 			if (this.onFontRegisterConflict === "error") throw new Error(message);
 			else if (this.onFontRegisterConflict === "warn-and-ignore") {
-				this.ctx.logger.warn(`${message} Ignoring new registration.`);
+				if (this.ctx) this.ctx.logger.warn(`${message} Ignoring new registration.`);
+				else console.warn(`${message} Ignoring new registration.`);
 				return;
-			} else if (this.onFontRegisterConflict === "warn-and-replace") this.ctx.logger.warn(`${message} Replacing previous registration.`);
+			} else if (this.onFontRegisterConflict === "warn-and-replace") if (this.ctx) this.ctx.logger.warn(`${message} Replacing previous registration.`);
+			else console.warn(`${message} Replacing previous registration.`);
 		}
 		await this.renderer.loadFonts(await Promise.all(fonts.map(async (font) => {
 			if (typeof font === "string") return {
@@ -56,28 +53,52 @@ var TakumiService = class {
 	}
 	async renderJsx(jsx, renderOptions, signal) {
 		const { node, stylesheets } = await fromJsx(jsx);
-		return this.renderer.render(node, withMergedStylesheets(stylesheets, renderOptions), combineAbortSignals(signal, this.abortController.signal));
+		return this.renderer.render(node, this.mergeRenderOptions({
+			stylesheets,
+			userOptions: renderOptions
+		}), combineAbortSignals(signal, this.abortController.signal));
 	}
 	async renderJsxWithEmoji(jsx, renderOptions, signal, emojiType = "noto") {
 		const { node, stylesheets } = await fromJsx(jsx);
 		const { node: processedNode, fetchedResources } = await this.processEmoji(node, emojiType);
-		return this.renderer.render(processedNode, withMergedStylesheets(stylesheets, {
-			...renderOptions,
-			fetchedResources: [...fetchedResources, ...renderOptions?.fetchedResources ?? []]
+		return this.renderer.render(processedNode, this.mergeRenderOptions({
+			stylesheets,
+			fetchedResources,
+			userOptions: renderOptions
 		}), combineAbortSignals(signal, this.abortController.signal));
 	}
 	async renderHtml(html, renderOptions, signal) {
 		const { node, stylesheets } = fromHtml(html);
-		return this.renderer.render(node, withMergedStylesheets(stylesheets, renderOptions), combineAbortSignals(signal, this.abortController.signal));
+		return this.renderer.render(node, this.mergeRenderOptions({
+			stylesheets,
+			userOptions: renderOptions
+		}), combineAbortSignals(signal, this.abortController.signal));
 	}
 	async renderHtmlWithEmoji(html, renderOptions, signal, emojiType = "noto") {
 		const { node, stylesheets } = fromHtml(html);
 		const { node: processedNode, fetchedResources } = await this.processEmoji(node, emojiType);
-		return this.renderer.render(processedNode, withMergedStylesheets(stylesheets, {
-			...renderOptions,
-			fetchedResources: [...fetchedResources, ...renderOptions?.fetchedResources ?? []]
+		return this.renderer.render(processedNode, this.mergeRenderOptions({
+			stylesheets,
+			fetchedResources,
+			userOptions: renderOptions
 		}), combineAbortSignals(signal, this.abortController.signal));
 	}
+	mergeRenderOptions(components) {
+		return {
+			...this.options?.renderDefaults,
+			...components.userOptions,
+			stylesheets: [
+				...this.options?.renderDefaults?.stylesheets ?? [],
+				...components.stylesheets ?? [],
+				...components.userOptions?.stylesheets ?? []
+			],
+			fetchedResources: [
+				...this.options?.renderDefaults?.fetchedResources ?? [],
+				...components.fetchedResources ?? [],
+				...components.userOptions?.fetchedResources ?? []
+			]
+		};
+	}
 	async processEmoji(node, emojiType = "twemoji") {
 		const processedNode = extractEmojis(node, emojiType);
 		return {
@@ -91,20 +112,23 @@ var TakumiService = class {
 };
 //#endregion
 //#region src/index.ts
+async function loadBuiltinFontsForService(service) {
+	const require = createRequire(import.meta.url);
+	await service.registerFontFamily("Inter", [require.resolve("../fonts/Inter-VariableFont_opsz,wght.ttf"), require.resolve("../fonts/Inter-Italic-VariableFont_opsz,wght.ttf")]);
+	await service.registerFontFamily("Roboto Mono", [require.resolve("../fonts/RobotoMono-VariableFont_wght.ttf"), require.resolve("../fonts/RobotoMono-Italic-VariableFont_wght.ttf")]);
+	await service.registerFontFamily("Noto Sans SC", [require.resolve("../fonts/NotoSansSC-VariableFont_wght.ttf")]);
+}
 const TakumiPlugin = definePlugin({
 	name: "takumi",
 	provides: [TakumiService],
 	async apply(ctx, options) {
-		const service = new TakumiService(ctx, options ?? {});
+		const service = new TakumiService(options, ctx);
 		if (options?.loadBuiltinFonts ?? true) {
 			ctx.logger.debug("Loading built-in fonts...");
-			const require = createRequire(import.meta.url);
-			await service.registerFontFamily("Inter", [require.resolve("../fonts/Inter-VariableFont_opsz,wght.ttf"), require.resolve("../fonts/Inter-Italic-VariableFont_opsz,wght.ttf")]);
-			await service.registerFontFamily("Roboto Mono", [require.resolve("../fonts/RobotoMono-VariableFont_wght.ttf"), require.resolve("../fonts/RobotoMono-Italic-VariableFont_wght.ttf")]);
-			await service.registerFontFamily("Noto Sans SC", [require.resolve("../fonts/NotoSansSC-VariableFont_wght.ttf")]);
+			await loadBuiltinFontsForService(service);
 		}
 		ctx.provide(TakumiService, service);
 	}
 });
 //#endregion
-export { TakumiPlugin, TakumiPlugin as default, TakumiService };
+export { TakumiPlugin, TakumiPlugin as default, TakumiService, loadBuiltinFontsForService };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fraqjs/plugin-takumi",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Takumi integration plugin for Fraq",
   "files": [
     "dist",
@@ -19,7 +19,7 @@
   "license": "MIT",
   "peerDependencies": {
     "react": "^19.0.0",
-    "@fraqjs/fraq": "^0.8.2"
+    "@fraqjs/fraq": "^0.10.1"
   },
   "dependencies": {
     "@takumi-rs/core": "^1.7.0",