Update to use variable instead of class

rzhade3 · lgarron · rzhade3 · commit c88a7a6f4542 · 2022-12-08T16:01:55.000-08:00
Co-authored-by: Lucas Garron &lt;lgarron@github.com&gt;
diff --git a/src/index.ts b/src/index.ts
@@ -5,4 +5,4 @@ export {html} from './html.js'
 export {isDirective, directive} from './directive.js'
 export {until} from './until.js'
 export {unsafeHTML} from './unsafe-html.js'
-export {TrustedTypesPolicy} from './trusted-types.js'
+export {setCSPTrustedTypesPolicy} from './trusted-types.js'
diff --git a/src/template-result.ts b/src/template-result.ts
@@ -1,6 +1,6 @@
 import {TemplateInstance, NodeTemplatePart} from '@github/template-parts'
 import type {TemplateTypeInit} from '@github/template-parts'
-import {TrustedTypesPolicy} from './trusted-types.js'
+import {getCSPTrustedTypesPolicy} from './trusted-types.js'
 
 const templates = new WeakMap<TemplateStringsArray, HTMLTemplateElement>()
 const renderedTemplates = new WeakMap<Node | NodeTemplatePart, HTMLTemplateElement>()
@@ -20,9 +20,7 @@ export class TemplateResult {
       const template = document.createElement('template')
       const end = this.strings.length - 1
       const html = this.strings.reduce((str, cur, i) => str + cur + (i < end ? `{{ ${i} }}` : ''), '')
-      const trustedHtml = TrustedTypesPolicy.cspTrustedTypesPolicy
-        ? (TrustedTypesPolicy.cspTrustedTypesPolicy.createHTML(html) as string)
-        : html
+      const trustedHtml = getCSPTrustedTypesPolicy() ? (getCSPTrustedTypesPolicy()?.createHTML(html) as string) : html
       template.innerHTML = trustedHtml
       templates.set(this.strings, template)
       return template
diff --git a/src/trusted-types.ts b/src/trusted-types.ts
@@ -6,10 +6,12 @@ interface CSPTrustedTypesPolicy {
   createHTML: (s: string) => CSPTrustedHTMLToStringable
 }
 
-export class TrustedTypesPolicy {
-  static cspTrustedTypesPolicy: CSPTrustedTypesPolicy | null = null
+let cspTrustedTypesPolicy: CSPTrustedTypesPolicy | null = null
 
-  static setTrustedTypesPolicy(policy: CSPTrustedTypesPolicy | null): void {
-    TrustedTypesPolicy.cspTrustedTypesPolicy = policy
-  }
+export function getCSPTrustedTypesPolicy() {
+  return cspTrustedTypesPolicy
+}
+
+export function setCSPTrustedTypesPolicy(policy: CSPTrustedTypesPolicy | null) {
+  cspTrustedTypesPolicy = policy
 }
diff --git a/src/unsafe-html.ts b/src/unsafe-html.ts
@@ -1,14 +1,12 @@
 import {directive} from './directive.js'
 import {NodeTemplatePart} from '@github/template-parts'
 import type {TemplatePart} from '@github/template-parts'
-import {TrustedTypesPolicy} from './trusted-types.js'
+import {getCSPTrustedTypesPolicy} from './trusted-types.js'
 
 export const unsafeHTML = directive((value: string) => (part: TemplatePart) => {
   if (!(part instanceof NodeTemplatePart)) return
   const template = document.createElement('template')
-  const trustedValue = TrustedTypesPolicy.cspTrustedTypesPolicy
-    ? (TrustedTypesPolicy.cspTrustedTypesPolicy.createHTML(value) as string)
-    : value
+  const trustedValue = getCSPTrustedTypesPolicy() ? (getCSPTrustedTypesPolicy()?.createHTML(value) as string) : value
   template.innerHTML = trustedValue
   const fragment = document.importNode(template.content, true)
   part.replace(...fragment.childNodes)
