Add type TrustedHTML to methods used to append HTML

Author: crypto

packages/@glimmer/interfaces/lib/dom/attributes.d.ts

@@ -1,3 +1,5 @@
+import type { TrustedHTML } from 'trusted-types/lib';
+
 import type { Maybe, Nullable } from '../core.js';
 import type { ElementOperations, Environment, ModifierInstance } from '../runtime.js';
 import type { Stack } from '../stack.js';
@@ -45,7 +47,7 @@ export interface DOMStack {
   appendText(string: string): SimpleText;
   appendComment(string: string): SimpleComment;
 
-  appendDynamicHTML(value: string): void;
+  appendDynamicHTML(value: string | TrustedHTML): void;
   appendDynamicText(value: string): SimpleText;
   appendDynamicFragment(value: SimpleDocumentFragment): void;
   appendDynamicNode(value: SimpleNode): void;

packages/@glimmer/interfaces/lib/dom/changes.d.ts

@@ -1,11 +1,17 @@
+import type { TrustedHTML } from 'trusted-types/lib';
+
 import type { Nullable } from '../core.js';
 import type { Bounds } from './bounds.js';
 import type { Namespace, SimpleComment, SimpleElement, SimpleNode, SimpleText } from './simple.js';
 
 export interface GlimmerDOMOperations {
   createElement(tag: string, context?: SimpleElement): SimpleElement;
   insertBefore(parent: SimpleElement, node: SimpleNode, reference: Nullable<SimpleNode>): void;
-  insertHTMLBefore(parent: SimpleElement, nextSibling: Nullable<SimpleNode>, html: string): Bounds;
+  insertHTMLBefore(
+    parent: SimpleElement,
+    nextSibling: Nullable<SimpleNode>,
+    html: string | TrustedHTML
+  ): Bounds;
   createTextNode(text: string): SimpleText;
   createComment(data: string): SimpleComment;
 }

packages/@glimmer/interfaces/package.json

@@ -20,7 +20,8 @@
     "test:types": "tsc --noEmit"
   },
   "dependencies": {
-    "@simple-dom/interface": "^1.4.0"
+    "@simple-dom/interface": "^1.4.0",
+    "@types/trusted-types": "^2.0.7"
   },
   "devDependencies": {
     "@glimmer-workspace/build-support": "workspace:^",

packages/@glimmer/runtime/lib/compiled/opcodes/content.ts

@@ -99,7 +99,7 @@ APPEND_OPCODES.add(Op.AppendHTML, (vm) => {
   let value = isEmpty(rawValue)
     ? ''
     : isTrustedHTML(rawValue)
-      ? (rawValue as string)
+      ? (rawValue)
       : String(rawValue);
 
   vm.elements().appendDynamicHTML(value);

packages/@glimmer/runtime/lib/dom/normalize.ts

@@ -1,5 +1,5 @@
 import type { Dict, SimpleDocumentFragment, SimpleNode } from '@glimmer/interfaces';
-import type { TrustedTypesWindow } from 'trusted-types/lib';
+import type { TrustedHTML,TrustedTypesWindow } from 'trusted-types/lib';
 
 export interface SafeString {
   toHTML(): string;
@@ -52,7 +52,7 @@ if (typeof window !== 'undefined') {
   }
 }
 
-export function isTrustedHTML(value: unknown): boolean {
+export function isTrustedHTML(value: unknown): value is TrustedHTML {
   return isHTML ? isHTML(value) : false;
 }
 

packages/@glimmer/runtime/lib/vm/element-builder.ts

@@ -19,6 +19,7 @@ import type {
   SimpleText,
   UpdatableBlock,
 } from '@glimmer/interfaces';
+import type { TrustedHTML } from 'trusted-types/lib';
 import { destroy, registerDestructor } from '@glimmer/destroyable';
 import { assert, expect, Stack } from '@glimmer/util';
 
@@ -301,7 +302,7 @@ export class NewElementBuilder implements ElementBuilder {
     }
   }
 
-  __appendHTML(html: string): Bounds {
+  __appendHTML(html: string| TrustedHTML): Bounds {
     return this.dom.insertHTMLBefore(this.element, this.nextSibling, html);
   }