@solidtv/renderer 1.1.2 → 1.1.3

package/src/core/Stage.ts

@@ -1067,7 +1067,7 @@ export class Stage {
    * @param options - Font loading options specific to the renderer type
    * @returns Promise that resolves when the font is loaded
    */
-  async loadFont(
+  loadFont(
     rendererType: TextRenderers,
     options: FontLoadOptions,
   ): Promise<void> {
@@ -1075,10 +1075,12 @@ export class Stage {
     const fontHandler = this.fontHandlers[rendererTypeKey];
 
     if (!fontHandler) {
-      throw new Error(
-        `Font handler for renderer type '${rendererTypeKey}' not found. Available types: ${Object.keys(
-          this.fontHandlers,
-        ).join(', ')}`,
+      return Promise.reject(
+        new Error(
+          `Font handler for renderer type '${rendererTypeKey}' not found. Available types: ${Object.keys(
+            this.fontHandlers,
+          ).join(', ')}`,
+        ),
       );
     }
 

package/src/core/lib/WebGlContextWrapper.ts

@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-
-import { assertTruthy, isProductionEnvironment } from '../../utils.js';
 import type {
   Vec2,
   Vec3,

package/src/core/lib/collectionUtils.ts

@@ -83,7 +83,7 @@ export const findChildIndexById = (
   for (let i = 0; i < children.length; i++) {
     const child = children[i]!;
 
-    // @ts-ignore - accessing protected property
+    // @ts-expect-error - accessing protected property
     if (child._id === node._id) {
       return i;
     }

package/src/core/renderers/canvas/CanvasRenderer.ts

@@ -229,7 +229,7 @@ export class CanvasRenderer extends CoreRenderer {
     return new CanvasShaderNode(shaderKey, shaderType, this.stage, props);
   }
 
-  createShaderProgram(shaderConfig) {
+  createShaderProgram(_shaderConfig) {
     return null;
   }
 
@@ -245,11 +245,11 @@ export class CanvasRenderer extends CoreRenderer {
     // noop
   }
 
-  removeRTTNode(node: CoreNode): void {
+  removeRTTNode(_node: CoreNode): void {
     // noop
   }
 
-  renderToTexture(node: CoreNode): void {
+  renderToTexture(_node: CoreNode): void {
     // noop
   }
   getBufferInfo(): null {

package/src/core/text-rendering/CanvasFontHandler.ts

@@ -65,7 +65,7 @@ const processFontData = (
 /**
  * Load a font by providing fontFamily, fontUrl, and optional metrics
  */
-export const loadFont = async (
+export const loadFont = (
   stage: Stage,
   options: FontLoadOptions,
 ): Promise<void> => {
@@ -73,7 +73,7 @@ export const loadFont = async (
 
   // If already loaded, return immediately
   if (fontCache.has(fontFamily) === true) {
-    return;
+    return Promise.resolve();
   }
 
   const existingPromise = fontLoadPromises.get(fontFamily);
@@ -117,7 +117,7 @@ export const getFontFamilies = (): FontFamilyMap => {
  */
 export const init = (
   c: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D,
-  mc: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D,
+  mc?: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D,
 ): void => {
   if (initialized === true) {
     return;
@@ -130,7 +130,7 @@ export const init = (
   }
 
   context = c;
-  measureContext = mc;
+  measureContext = mc || c;
 
   // Register the default 'sans-serif' font face
   const defaultMetrics: FontMetrics = {

package/src/core/text-rendering/CanvasTextRenderer.ts

@@ -1,6 +1,10 @@
 import { assertTruthy } from '../../utils.js';
 import type { Stage } from '../Stage.js';
-import type { TextLineStruct, TextRenderInfo } from './TextRenderer.js';
+import type {
+  FontHandler,
+  TextLineStruct,
+  TextRenderInfo,
+} from './TextRenderer.js';
 import * as CanvasFontHandler from './CanvasFontHandler.js';
 import type { CoreTextNodeProps } from '../CoreTextNode.js';
 import { hasZeroWidthSpace } from './Utils.js';
@@ -9,6 +13,7 @@ import { mapTextLayout } from './TextLayoutEngine.js';
 const MAX_TEXTURE_DIMENSION = 4096;
 
 const type = 'canvas' as const;
+const font: FontHandler = CanvasFontHandler;
 
 let canvas: HTMLCanvasElement | OffscreenCanvas | null = null;
 let context:
@@ -238,7 +243,7 @@ const renderQuads = (): void => {
  */
 const CanvasTextRenderer = {
   type,
-  font: CanvasFontHandler,
+  font,
   renderText,
   addQuads,
   renderQuads,

package/src/core/text-rendering/SdfFontHandler.ts

@@ -259,14 +259,14 @@ export const canRenderFont = (trProps: TrProps): boolean => {
  * @param {string} options.atlasUrl - PNG atlas texture URL
  * @param {FontMetrics} options.metrics - Optional font metrics
  */
-export const loadFont = async (
+export const loadFont = (
   stage: Stage,
   options: FontLoadOptions,
 ): Promise<void> => {
   const { fontFamily, atlasUrl, atlasDataUrl, metrics } = options;
   // Early return if already loaded
   if (fontCache.get(fontFamily) !== undefined) {
-    return;
+    return Promise.resolve();
   }
 
   // Early return if already loading
@@ -276,8 +276,8 @@ export const loadFont = async (
   }
 
   if (atlasDataUrl === undefined) {
-    throw new Error(
-      `Atlas data URL must be provided for SDF font: ${fontFamily}`,
+    return Promise.reject(
+      new Error(`Atlas data URL must be provided for SDF font: ${fontFamily}`),
     );
   }
 

package/src/core/text-rendering/Utils.ts

@@ -1,5 +1,3 @@
-import type { NormalizedFontMetrics } from './TextRenderer.js';
-
 const invisibleChars = /[\u200B\u200C\u200D\uFEFF\u00AD\u2060]/g;
 
 /**

package/src/core/textures/ImageTexture.ts

@@ -12,10 +12,7 @@ import {
 import { isSvgImage, loadSvg } from '../lib/textureSvg.js';
 import { fetchJson } from '../lib/utils.js';
 import type { Platform } from '../platforms/Platform.js';
-import {
-  ENABLE_COMPRESSED_TEXTURES,
-  isProductionEnvironment,
-} from '../../utils.js';
+import { ENABLE_COMPRESSED_TEXTURES } from '../../utils.js';
 
 /**
  * Properties of the {@link ImageTexture}

package/src/core/textures/SubTexture.ts

@@ -1,4 +1,3 @@
-import type { Dimensions } from '../../common/CommonTypes.js';
 import { assertTruthy } from '../../utils.js';
 import type { CoreTextureManager } from '../CoreTextureManager.js';
 import { ImageTexture } from './ImageTexture.js';
@@ -8,7 +7,6 @@ import {
   type TextureData,
   type TextureFailedEventHandler,
   type TextureLoadedEventHandler,
-  type TextureState,
 } from './Texture.js';
 
 let subTextureId = 0;

package/src/core/textures/Texture.ts

@@ -153,6 +153,13 @@ export abstract class Texture extends EventEmitter {
 
   public textureData: TextureData | null = null;
 
+  /**
+   * Cache key under which this texture is registered in the
+   * {@link CoreTextureManager} keyCache, or `null` if the texture is
+   * not cached. Owned by the texture manager.
+   */
+  public cacheKey: string | null = null;
+
   public memUsed = 0;
 
   /**