From 1ad81933f458d1bd2527c9d4a7ab41eb45373304 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Tue, 6 Feb 2024 09:37:26 -0600
Subject: [PATCH 01/33] tsconfig setup

---
 packages/kg-default-nodes/.gitignore          |  1 +
 .../lib/KoenigDecoratorNode.js                | 11 ------
 .../lib/KoenigDecoratorNode.ts                | 12 +++++++
 ...g-default-nodes.js => kg-default-nodes.ts} |  0
 packages/kg-default-nodes/package.json        | 11 +++---
 packages/kg-default-nodes/tsconfig.json       | 34 +++++++++++++++++++
 yarn.lock                                     |  2 +-
 7 files changed, 54 insertions(+), 17 deletions(-)
 delete mode 100644 packages/kg-default-nodes/lib/KoenigDecoratorNode.js
 create mode 100644 packages/kg-default-nodes/lib/KoenigDecoratorNode.ts
 rename packages/kg-default-nodes/lib/{kg-default-nodes.js => kg-default-nodes.ts} (100%)
 create mode 100644 packages/kg-default-nodes/tsconfig.json

diff --git a/packages/kg-default-nodes/.gitignore b/packages/kg-default-nodes/.gitignore
index 8e6861d207..c502d7033e 100644
--- a/packages/kg-default-nodes/.gitignore
+++ b/packages/kg-default-nodes/.gitignore
@@ -1,2 +1,3 @@
 cjs/
 es/
+build/
\ No newline at end of file
diff --git a/packages/kg-default-nodes/lib/KoenigDecoratorNode.js b/packages/kg-default-nodes/lib/KoenigDecoratorNode.js
deleted file mode 100644
index f6a6537ade..0000000000
--- a/packages/kg-default-nodes/lib/KoenigDecoratorNode.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/* eslint-disable ghost/filenames/match-exported-class */
-/* c8 ignore start */
-import {DecoratorNode} from 'lexical';
-
-export class KoenigDecoratorNode extends DecoratorNode {
-}
-
-export function $isKoenigCard(node) {
-    return node instanceof KoenigDecoratorNode;
-}
-/* c8 ignore end */
diff --git a/packages/kg-default-nodes/lib/KoenigDecoratorNode.ts b/packages/kg-default-nodes/lib/KoenigDecoratorNode.ts
new file mode 100644
index 0000000000..700310f23a
--- /dev/null
+++ b/packages/kg-default-nodes/lib/KoenigDecoratorNode.ts
@@ -0,0 +1,12 @@
+/* eslint-disable ghost/filenames/match-exported-class */
+/* c8 ignore start */
+import {DecoratorNode} from 'lexical';
+import type {LexicalNode} from 'lexical';
+
+export class KoenigDecoratorNode extends DecoratorNode<JSX.Element> {
+}
+
+export function $isKoenigCard(node: LexicalNode): boolean {
+    return node instanceof KoenigDecoratorNode;
+}
+/* c8 ignore end */
\ No newline at end of file
diff --git a/packages/kg-default-nodes/lib/kg-default-nodes.js b/packages/kg-default-nodes/lib/kg-default-nodes.ts
similarity index 100%
rename from packages/kg-default-nodes/lib/kg-default-nodes.js
rename to packages/kg-default-nodes/lib/kg-default-nodes.ts
diff --git a/packages/kg-default-nodes/package.json b/packages/kg-default-nodes/package.json
index 4dc97c1389..ac5ec34219 100644
--- a/packages/kg-default-nodes/package.json
+++ b/packages/kg-default-nodes/package.json
@@ -6,15 +6,15 @@
   "license": "MIT",
   "main": "cjs/kg-default-nodes.js",
   "module": "es/kg-default-nodes.js",
-  "source": "lib/kg-default-nodes.js",
+  "source": "build/kg-default-nodes.js",
   "scripts": {
-    "dev": "rollup -c -w",
-    "build": "rollup -c",
+    "dev": "tsc && rollup -c -w",
+    "build": "tsc && rollup -c",
     "prepare": "NODE_ENV=production yarn build",
     "pretest": "yarn build",
     "test:unit": "NODE_ENV=testing c8 --all --check-coverage --reporter text --reporter cobertura mocha './test/**/*.test.js'",
     "test": "yarn test:unit",
-    "lint:code": "eslint *.js lib/ --ext .js --cache",
+    "lint:code": "eslint *.js lib/ --ext .js --cache && eslint *.ts lib/ --ext .ts --cache",
     "lint": "yarn lint:code && yarn lint:test",
     "lint:test": "eslint -c test/.eslintrc.js test/ --ext .js --cache"
   },
@@ -41,7 +41,8 @@
     "prettier": "^3.0.1",
     "rollup": "4.9.5",
     "should": "13.2.3",
-    "sinon": "17.0.1"
+    "sinon": "17.0.1",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "@lexical/clipboard": "0.12.2",
diff --git a/packages/kg-default-nodes/tsconfig.json b/packages/kg-default-nodes/tsconfig.json
new file mode 100644
index 0000000000..e4cbc7f878
--- /dev/null
+++ b/packages/kg-default-nodes/tsconfig.json
@@ -0,0 +1,34 @@
+{
+  // required for tests to find module declarations in the src folder
+  "ts-node": {
+    "files": true
+  },
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig to read more about this file */
+
+    /* Projects */
+    "incremental": true,                      /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
+
+    /* Language and Environment */
+    "target": "es2022",                       /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+
+    /* Modules */
+    "rootDir": "lib",                         /* Specify the root folder within your source files. */
+    "moduleResolution": "node",               /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+
+    /* JavaScript Support */
+    "allowJs": true,                          /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
+
+    /* Emit */
+    "declaration": true,                      /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+    "sourceMap": true,                        /* Create source map files for emitted JavaScript files. */
+    "outDir": "build",                        /* Specify an output folder for all emitted files. */
+    "esModuleInterop": true,                  /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
+
+    /* Type Checking */
+    "strict": true,                           /* Enable all strict type-checking options. */
+    "noImplicitAny": true,                    /* Enable error reporting for expressions and declarations with an implied 'any' type. */
+  },
+  "include": ["lib/**/*"]
+}
diff --git a/yarn.lock b/yarn.lock
index 04a20f40da..47e6591164 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19043,7 +19043,7 @@ typescript@5.2.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
   integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
-typescript@5.3.3, "typescript@>=3 < 6":
+typescript@5.3.3, "typescript@>=3 < 6", typescript@^5.3.3:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==

From 177295c331e5b11c2cdebad0e8c5fe98469f82ff Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Tue, 6 Feb 2024 11:19:02 -0600
Subject: [PATCH 02/33] update c8 coverage

---
 packages/kg-default-nodes/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kg-default-nodes/package.json b/packages/kg-default-nodes/package.json
index ac5ec34219..01956c7647 100644
--- a/packages/kg-default-nodes/package.json
+++ b/packages/kg-default-nodes/package.json
@@ -12,7 +12,7 @@
     "build": "tsc && rollup -c",
     "prepare": "NODE_ENV=production yarn build",
     "pretest": "yarn build",
-    "test:unit": "NODE_ENV=testing c8 --all --check-coverage --reporter text --reporter cobertura mocha './test/**/*.test.js'",
+    "test:unit": "NODE_ENV=testing c8 --lib --check-coverage --reporter text --reporter cobertura mocha './test/**/*.test.js'",
     "test": "yarn test:unit",
     "lint:code": "eslint *.js lib/ --ext .js --cache && eslint *.ts lib/ --ext .ts --cache",
     "lint": "yarn lint:code && yarn lint:test",

From 508e191a2773aab4d5dc95e206aabbde5bd0bddb Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Tue, 6 Feb 2024 11:19:18 -0600
Subject: [PATCH 03/33] remove tsbuildinfo

---
 packages/kg-default-nodes/.gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/kg-default-nodes/.gitignore b/packages/kg-default-nodes/.gitignore
index c502d7033e..4837d66e23 100644
--- a/packages/kg-default-nodes/.gitignore
+++ b/packages/kg-default-nodes/.gitignore
@@ -1,3 +1,4 @@
 cjs/
 es/
-build/
\ No newline at end of file
+build/
+tsconfig.tsbuildinfo
\ No newline at end of file

From 2a4cad35a83b02bce0fcf2799603abd540589380 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Tue, 6 Feb 2024 11:19:29 -0600
Subject: [PATCH 04/33] test converting a node

---
 .../aside/{AsideNode.js => AsideNode.ts}      | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)
 rename packages/kg-default-nodes/lib/nodes/aside/{AsideNode.js => AsideNode.ts} (61%)

diff --git a/packages/kg-default-nodes/lib/nodes/aside/AsideNode.js b/packages/kg-default-nodes/lib/nodes/aside/AsideNode.ts
similarity index 61%
rename from packages/kg-default-nodes/lib/nodes/aside/AsideNode.js
rename to packages/kg-default-nodes/lib/nodes/aside/AsideNode.ts
index 995ee83e59..eaecca86a7 100644
--- a/packages/kg-default-nodes/lib/nodes/aside/AsideNode.js
+++ b/packages/kg-default-nodes/lib/nodes/aside/AsideNode.ts
@@ -1,13 +1,19 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {ElementNode} from 'lexical';
+import {ElementFormatType, ElementNode, LexicalNode, NodeKey, SerializedLexicalNode, Spread} from 'lexical';
 import {AsideParser} from './AsideParser';
 
+export type SerializedAsideNode = Spread<{
+    format: ElementFormatType,
+    indent: number,
+    direction: 'ltr' | 'rtl' | null
+}, SerializedLexicalNode>;
+
 export class AsideNode extends ElementNode {
-    static getType() {
+    static getType(): string {
         return 'aside';
     }
 
-    static clone(node) {
+    static clone(node: AsideNode): AsideNode {
         return new this(
             node.__key
         );
@@ -17,11 +23,11 @@ export class AsideNode extends ElementNode {
         return {};
     }
 
-    constructor(key) {
+    constructor(key?: NodeKey) {
         super(key);
     }
 
-    static importJSON(serializedNode) {
+    static importJSON(serializedNode: SerializedAsideNode): AsideNode {
         const node = new this();
         node.setFormat(serializedNode.format);
         node.setIndent(serializedNode.indent);
@@ -44,28 +50,28 @@ export class AsideNode extends ElementNode {
     }
 
     /* c8 ignore start */
-    createDOM() {
+    createDOM(): HTMLElement {
         return document.createElement('div');
     }
 
-    updateDOM() {
+    updateDOM(): false {
         return false;
     }
 
-    isInline() {
+    isInline(): false {
         return false;
     }
 
-    extractWithChild() {
+    extractWithChild(): true {
         return true;
     }
     /* c8 ignore stop */
 }
 
-export function $createAsideNode() {
+export function $createAsideNode(): AsideNode {
     return new AsideNode();
 }
 
-export function $isAsideNode(node) {
+export function $isAsideNode(node: LexicalNode | null): node is AsideNode {
     return node instanceof AsideNode;
 }

From 120672011cad40caec3ce37f69abd3e9e968f5f7 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Tue, 6 Feb 2024 13:09:14 -0600
Subject: [PATCH 05/33] convert some nodes, need to resolve exportDOM

---
 ...dHeadingNode.js => ExtendedHeadingNode.ts} | 31 +++++++++++--------
 ...endedQuoteNode.js => ExtendedQuoteNode.ts} | 16 +++++-----
 ...xtendedTextNode.js => ExtendedTextNode.ts} | 24 +++++++-------
 .../lib/nodes/{TKNode.js => TKNode.ts}        | 25 ++++++++-------
 4 files changed, 51 insertions(+), 45 deletions(-)
 rename packages/kg-default-nodes/lib/nodes/{ExtendedHeadingNode.js => ExtendedHeadingNode.ts} (63%)
 rename packages/kg-default-nodes/lib/nodes/{ExtendedQuoteNode.js => ExtendedQuoteNode.ts} (84%)
 rename packages/kg-default-nodes/lib/nodes/{ExtendedTextNode.js => ExtendedTextNode.ts} (82%)
 rename packages/kg-default-nodes/lib/nodes/{TKNode.js => TKNode.ts} (66%)

diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.js b/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
similarity index 63%
rename from packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.js
rename to packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
index ca02a772ae..7bd659ba4a 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.js
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
@@ -1,5 +1,6 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {HeadingNode} from '@lexical/rich-text';
+import {HeadingNode, SerializedHeadingNode} from '@lexical/rich-text';
+import { DOMConversion, DOMConversionFn, DOMConversionMap, DOMConversionOutput, Spread } from 'lexical';
 
 // Since the HeadingNode is foundational to Lexical rich-text, only using a
 // custom HeadingNode is undesirable as it means every package would need to
@@ -9,45 +10,48 @@ import {HeadingNode} from '@lexical/rich-text';
 //
 // https://lexical.dev/docs/concepts/serialization#handling-extended-html-styling
 
-export const extendedHeadingNodeReplacement = {replace: HeadingNode, with: node => new ExtendedHeadingNode(node.__tag)};
+export const extendedHeadingNodeReplacement = {replace: HeadingNode, with: (node: HeadingNode) => new ExtendedHeadingNode(node.__tag)};
+
+type HeadingTagType = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
 
 export class ExtendedHeadingNode extends HeadingNode {
-    constructor(tag, key) {
+    constructor(tag: HeadingTagType, key?: string) {
         super(tag, key);
     }
 
-    static getType() {
+    static getType(): string {
         return 'extended-heading';
     }
 
-    static clone(node) {
+    static clone(node: ExtendedHeadingNode): ExtendedHeadingNode {
         return new ExtendedHeadingNode(node.__tag, node.__key);
     }
 
-    static importDOM() {
+    static importDOM(): DOMConversionMap | null {
         const importers = HeadingNode.importDOM();
+        const originalParagraphImporter = importers?.p as DOMConversionFn;
         return {
             ...importers,
-            p: patchParagraphConversion(importers?.p)
+            p: patchParagraphConversion(originalParagraphImporter)
         };
     }
 
-    static importJSON(serializedNode) {
+    static importJSON(serializedNode: SerializedHeadingNode): ExtendedHeadingNode {
         return HeadingNode.importJSON(serializedNode);
     }
 
-    exportJSON() {
+    exportJSON(): SerializedHeadingNode {
         const json = super.exportJSON();
         json.type = 'extended-heading';
         return json;
     }
 }
 
-function patchParagraphConversion(originalDOMConverter) {
-    return (node) => {
+function patchParagraphConversion(originalDOMConverter: DOMConversionFn): DOMConversion | null {
+    return (node: HTMLElement) => {
         // Original matches Google Docs p node to a null conversion so it's
         // child span is parsed as a heading. Don't prevent that here
-        const original = originalDOMConverter?.(node);
+        const original = originalDOMConverter(node);
         if (original) {
             return original;
         }
@@ -62,10 +66,11 @@ function patchParagraphConversion(originalDOMConverter) {
         if (hasAriaHeadingRole && hasAriaLevel) {
             const level = parseInt(hasAriaLevel, 10);
             if (level > 0 && level < 7) {
+                const tag: HeadingTagType = `h${level}` as HeadingTagType;
                 return {
                     conversion: () => {
                         return {
-                            node: new ExtendedHeadingNode(`h${level}`)
+                            node: new ExtendedHeadingNode(tag)
                         };
                     },
                     priority: 1
diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.js b/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
similarity index 84%
rename from packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.js
rename to packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
index 577cda211f..35c6d1c115 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.js
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
@@ -1,6 +1,6 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {QuoteNode} from '@lexical/rich-text';
-import {$createLineBreakNode, $isParagraphNode} from 'lexical';
+import {QuoteNode, SerializedQuoteNode} from '@lexical/rich-text';
+import {$createLineBreakNode, $isParagraphNode, DOMConversionMap, NodeKey} from 'lexical';
 
 // Since the QuoteNode is foundational to Lexical rich-text, only using a
 // custom QuoteNode is undesirable as it means every package would need to
@@ -13,7 +13,7 @@ import {$createLineBreakNode, $isParagraphNode} from 'lexical';
 export const extendedQuoteNodeReplacement = {replace: QuoteNode, with: () => new ExtendedQuoteNode()};
 
 export class ExtendedQuoteNode extends QuoteNode {
-    constructor(key) {
+    constructor(key?: NodeKey) {
         super(key);
     }
 
@@ -21,11 +21,11 @@ export class ExtendedQuoteNode extends QuoteNode {
         return 'extended-quote';
     }
 
-    static clone(node) {
+    static clone(node: ExtendedQuoteNode): ExtendedQuoteNode {
         return new ExtendedQuoteNode(node.__key);
     }
 
-    static importDOM() {
+    static importDOM(): DOMConversionMap | null {
         const importers = QuoteNode.importDOM();
         return {
             ...importers,
@@ -33,18 +33,18 @@ export class ExtendedQuoteNode extends QuoteNode {
         };
     }
 
-    static importJSON(serializedNode) {
+    static importJSON(serializedNode: SerializedQuoteNode): ExtendedQuoteNode {
         return QuoteNode.importJSON(serializedNode);
     }
 
-    exportJSON() {
+    exportJSON(): SerializedQuoteNode {
         const json = super.exportJSON();
         json.type = 'extended-quote';
         return json;
     }
 
     /* c8 ignore start */
-    extractWithChild() {
+    extractWithChild(): true {
         return true;
     }
     /* c8 ignore end */
diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.js b/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
similarity index 82%
rename from packages/kg-default-nodes/lib/nodes/ExtendedTextNode.js
rename to packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
index 07744fd710..ee3bad4e02 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.js
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {$isTextNode, TextNode} from 'lexical';
+import {$isTextNode, DOMConversion, DOMConversionFn, DOMConversionMap, LexicalNode, NodeKey, SerializedTextNode, TextNode} from 'lexical';
 
 // Since the TextNode is foundational to all Lexical packages, including the
 // plain text use case. Handling any rich text logic is undesirable. This creates
@@ -8,22 +8,22 @@ import {$isTextNode, TextNode} from 'lexical';
 //
 // https://lexical.dev/docs/concepts/serialization#handling-extended-html-styling
 
-export const extendedTextNodeReplacement = {replace: TextNode, with: node => new ExtendedTextNode(node.__text)};
+export const extendedTextNodeReplacement = {replace: TextNode, with: (node: TextNode) => new ExtendedTextNode(node.__text)};
 
 export class ExtendedTextNode extends TextNode {
-    constructor(text, key) {
+    constructor(text: string, key?: NodeKey) {
         super(text, key);
     }
 
-    static getType() {
+    static getType(): string {
         return 'extended-text';
     }
 
-    static clone(node) {
+    static clone(node: ExtendedTextNode): ExtendedTextNode {
         return new ExtendedTextNode(node.__text, node.__key);
     }
 
-    static importDOM() {
+    static importDOM(): DOMConversionMap | null {
         const importers = TextNode.importDOM();
         return {
             ...importers,
@@ -34,17 +34,17 @@ export class ExtendedTextNode extends TextNode {
         };
     }
 
-    static importJSON(serializedNode) {
+    static importJSON(serializedNode: SerializedTextNode): ExtendedTextNode {
         return TextNode.importJSON(serializedNode);
     }
 
-    exportJSON() {
+    exportJSON(): SerializedTextNode {
         const json = super.exportJSON();
         json.type = 'extended-text';
         return json;
     }
 
-    isSimpleText() {
+    isSimpleText(): boolean {
         return (
             (this.__type === 'text' || this.__type === 'extended-text') &&
             this.__mode === 0
@@ -52,8 +52,8 @@ export class ExtendedTextNode extends TextNode {
     }
 }
 
-function patchConversion(originalDOMConverter, convertFn) {
-    return (node) => {
+function patchConversion(originalDOMConverter: DOMConversion, convertFn: DOMConversionFn) {
+    return (node: HTMLElement) => {
         const original = originalDOMConverter?.(node);
         if (!original) {
             return null;
@@ -78,7 +78,7 @@ function patchConversion(originalDOMConverter, convertFn) {
     };
 }
 
-function convertSpanElement(lexicalNode, domNode) {
+function convertSpanElement(lexicalNode: ExtendedTextNode, domNode: HTMLElement): ExtendedTextNode {
     const span = domNode;
 
     // Word uses span tags + font-weight for bold text
diff --git a/packages/kg-default-nodes/lib/nodes/TKNode.js b/packages/kg-default-nodes/lib/nodes/TKNode.ts
similarity index 66%
rename from packages/kg-default-nodes/lib/nodes/TKNode.js
rename to packages/kg-default-nodes/lib/nodes/TKNode.ts
index f39cd03734..5b1313972c 100644
--- a/packages/kg-default-nodes/lib/nodes/TKNode.js
+++ b/packages/kg-default-nodes/lib/nodes/TKNode.ts
@@ -1,28 +1,29 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {$applyNodeReplacement, TextNode} from 'lexical';
+import {$applyNodeReplacement, EditorConfig, LexicalNode, NodeKey, TextNode} from 'lexical';
+import {SerializedTextNode} from 'lexical/nodes/LexicalTextNode';
 
 export class TKNode extends TextNode {
-    static getType() {
+    static getType(): string {
         return 'tk';
     }
 
-    static clone(node) {
+    static clone(node: TKNode): TKNode {
         return new TKNode(node.__text, node.__key);
     }
 
-    constructor(text, key) {
+    constructor(text: string, key?: NodeKey) {
         super(text, key);
     }
 
-    createDOM(config) {
+    createDOM(config: EditorConfig) {
         const element = super.createDOM(config);
         const classes = config.theme.tk?.split(' ') || [];
         element.classList.add(...classes);
-        element.dataset.kgTk = true;
+        element.dataset.kgTk = "true";
         return element;
     }
 
-    static importJSON(serializedNode) {
+    static importJSON(serializedNode: SerializedTextNode): TKNode {
         const node = $createTKNode(serializedNode.text);
         node.setFormat(serializedNode.format);
         node.setDetail(serializedNode.detail);
@@ -31,18 +32,18 @@ export class TKNode extends TextNode {
         return node;
     }
 
-    exportJSON() {
+    exportJSON(): SerializedTextNode {
         return {
             ...super.exportJSON(),
             type: 'tk'
         };
     }
 
-    canInsertTextBefore() {
+    canInsertTextBefore(): false {
         return false;
     }
 
-    isTextEntity() {
+    isTextEntity(): true {
         return true;
     }
 }
@@ -52,7 +53,7 @@ export class TKNode extends TextNode {
  * @param text - The text used inside the TKNode.
  * @returns - The TKNode with the embedded text.
  */
-export function $createTKNode(text) {
+export function $createTKNode(text: string): TKNode {
     return $applyNodeReplacement(new TKNode(text));
 }
 
@@ -61,6 +62,6 @@ export function $createTKNode(text) {
  * @param node - The node to be checked.
  * @returns true if node is a TKNode, false otherwise.
  */
-export function $isTKNode(node) {
+export function $isTKNode(node: LexicalNode): node is TKNode {
     return node instanceof TKNode;
 }

From 4a88ac0e7f7f31b5fc0776b15a21705b27f88fe4 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Tue, 6 Feb 2024 18:13:06 -0600
Subject: [PATCH 06/33] patch up extended nodes

- note: any type is used for some of the conversions for the moment as a convenience.. these are going to need refactoring
---
 .../lib/nodes/ExtendedHeadingNode.ts          | 21 +++++++++----------
 .../lib/nodes/ExtendedQuoteNode.ts            |  9 ++++----
 .../lib/nodes/ExtendedTextNode.ts             | 13 +++++++-----
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts b/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
index 7bd659ba4a..2fd169bbce 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
@@ -1,6 +1,6 @@
 /* eslint-disable ghost/filenames/match-exported-class */
 import {HeadingNode, SerializedHeadingNode} from '@lexical/rich-text';
-import { DOMConversion, DOMConversionFn, DOMConversionMap, DOMConversionOutput, Spread } from 'lexical';
+import {DOMConversionMap} from 'lexical';
 
 // Since the HeadingNode is foundational to Lexical rich-text, only using a
 // custom HeadingNode is undesirable as it means every package would need to
@@ -29,11 +29,10 @@ export class ExtendedHeadingNode extends HeadingNode {
 
     static importDOM(): DOMConversionMap | null {
         const importers = HeadingNode.importDOM();
-        const originalParagraphImporter = importers?.p as DOMConversionFn;
         return {
             ...importers,
-            p: patchParagraphConversion(originalParagraphImporter)
-        };
+            p: patchParagraphConversion(importers?.p)
+        }
     }
 
     static importJSON(serializedNode: SerializedHeadingNode): ExtendedHeadingNode {
@@ -47,17 +46,17 @@ export class ExtendedHeadingNode extends HeadingNode {
     }
 }
 
-function patchParagraphConversion(originalDOMConverter: DOMConversionFn): DOMConversion | null {
-    return (node: HTMLElement) => {
+// ignore no explicit any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function patchParagraphConversion(originalDOMConverter: any) {
+    return (node: Node) => {
+        const p = node as HTMLParagraphElement;
         // Original matches Google Docs p node to a null conversion so it's
         // child span is parsed as a heading. Don't prevent that here
-        const original = originalDOMConverter(node);
-        if (original) {
-            return original;
+        if (originalDOMConverter) {
+            return originalDOMConverter(p);
         }
 
-        const p = node;
-
         // Word uses paragraphs with role="heading" to represent headings
         // and an aria-level="x" to represent the heading level
         const hasAriaHeadingRole = p.getAttribute('role') === 'heading';
diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts b/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
index 35c6d1c115..2dacb5ed59 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
@@ -1,6 +1,6 @@
 /* eslint-disable ghost/filenames/match-exported-class */
 import {QuoteNode, SerializedQuoteNode} from '@lexical/rich-text';
-import {$createLineBreakNode, $isParagraphNode, DOMConversionMap, NodeKey} from 'lexical';
+import {$createLineBreakNode, $isParagraphNode, DOMConversion, DOMConversionMap, DOMConversionOutput, LexicalNode, NodeKey} from 'lexical';
 
 // Since the QuoteNode is foundational to Lexical rich-text, only using a
 // custom QuoteNode is undesirable as it means every package would need to
@@ -34,7 +34,8 @@ export class ExtendedQuoteNode extends QuoteNode {
     }
 
     static importJSON(serializedNode: SerializedQuoteNode): ExtendedQuoteNode {
-        return QuoteNode.importJSON(serializedNode);
+        const json = QuoteNode.importJSON(serializedNode) as ExtendedQuoteNode;
+        return json;
     }
 
     exportJSON(): SerializedQuoteNode {
@@ -50,7 +51,7 @@ export class ExtendedQuoteNode extends QuoteNode {
     /* c8 ignore end */
 }
 
-function convertBlockquoteElement() {
+function convertBlockquoteElement(): DOMConversion {
     return {
         conversion: () => {
             const node = new ExtendedQuoteNode();
@@ -61,7 +62,7 @@ function convertBlockquoteElement() {
                     // editor we parsed all of the nested paragraphs into a single blockquote
                     // separating each paragraph with two line breaks. We replicate that
                     // here so we don't have a breaking change in conversion behaviour.
-                    const newChildNodes = [];
+                    const newChildNodes: LexicalNode[] = [];
 
                     childNodes.forEach((child) => {
                         if ($isParagraphNode(child)) {
diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts b/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
index ee3bad4e02..8872d5516c 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {$isTextNode, DOMConversion, DOMConversionFn, DOMConversionMap, LexicalNode, NodeKey, SerializedTextNode, TextNode} from 'lexical';
+import {$isTextNode, DOMChildConversion, DOMConversion, DOMConversionFn, DOMConversionMap, LexicalNode, NodeKey, SerializedTextNode, TextNode} from 'lexical';
 
 // Since the TextNode is foundational to all Lexical packages, including the
 // plain text use case. Handling any rich text logic is undesirable. This creates
@@ -25,10 +25,11 @@ export class ExtendedTextNode extends TextNode {
 
     static importDOM(): DOMConversionMap | null {
         const importers = TextNode.importDOM();
+        const importersSpanConversion = importers?.span;
         return {
             ...importers,
             span: () => ({
-                conversion: patchConversion(importers?.span, convertSpanElement),
+                conversion: patchConversion(importersSpanConversion, convertSpanElement),
                 priority: 1
             })
         };
@@ -52,8 +53,10 @@ export class ExtendedTextNode extends TextNode {
     }
 }
 
-function patchConversion(originalDOMConverter: DOMConversion, convertFn: DOMConversionFn) {
-    return (node: HTMLElement) => {
+// ignore no implicit any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function patchConversion(originalDOMConverter: any, convertFn: any): DOMConversionFn {
+    return (node: Node) => {
         const original = originalDOMConverter?.(node);
         if (!original) {
             return null;
@@ -67,7 +70,7 @@ function patchConversion(originalDOMConverter: DOMConversion, convertFn: DOMConv
         return {
             ...originalOutput,
             forChild: (lexicalNode, parent) => {
-                const originalForChild = originalOutput?.forChild ?? (x => x);
+                const originalForChild = originalOutput?.forChild;
                 const result = originalForChild(lexicalNode, parent);
                 if ($isTextNode(result)) {
                     return convertFn(result, node);

From 5e8a9051a3a25de7dd571c44fccc18c42f1b398a Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 7 Feb 2024 08:22:32 -0600
Subject: [PATCH 07/33] upd nodes

---
 .../lib/nodes/aside/AsideNode.ts              |  5 ++--
 .../lib/nodes/aside/AsideParser.js            | 24 -------------------
 .../lib/nodes/aside/aside-parser.ts           | 20 ++++++++++++++++
 .../{button-parser.js => button-parser.ts}    | 19 ++++++++++-----
 4 files changed, 35 insertions(+), 33 deletions(-)
 delete mode 100644 packages/kg-default-nodes/lib/nodes/aside/AsideParser.js
 create mode 100644 packages/kg-default-nodes/lib/nodes/aside/aside-parser.ts
 rename packages/kg-default-nodes/lib/nodes/button/{button-parser.js => button-parser.ts} (52%)

diff --git a/packages/kg-default-nodes/lib/nodes/aside/AsideNode.ts b/packages/kg-default-nodes/lib/nodes/aside/AsideNode.ts
index eaecca86a7..c5cca7b964 100644
--- a/packages/kg-default-nodes/lib/nodes/aside/AsideNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/aside/AsideNode.ts
@@ -1,6 +1,6 @@
 /* eslint-disable ghost/filenames/match-exported-class */
 import {ElementFormatType, ElementNode, LexicalNode, NodeKey, SerializedLexicalNode, Spread} from 'lexical';
-import {AsideParser} from './AsideParser';
+import {parseAsideNode} from './aside-parser';
 
 export type SerializedAsideNode = Spread<{
     format: ElementFormatType,
@@ -45,8 +45,7 @@ export class AsideNode extends ElementNode {
     }
 
     static importDOM() {
-        const parser = new AsideParser(this);
-        return parser.DOMConversionMap;
+        return parseAsideNode();
     }
 
     /* c8 ignore start */
diff --git a/packages/kg-default-nodes/lib/nodes/aside/AsideParser.js b/packages/kg-default-nodes/lib/nodes/aside/AsideParser.js
deleted file mode 100644
index 662cf5234d..0000000000
--- a/packages/kg-default-nodes/lib/nodes/aside/AsideParser.js
+++ /dev/null
@@ -1,24 +0,0 @@
-export class AsideParser {
-    constructor(NodeClass) {
-        this.NodeClass = NodeClass;
-    }
-
-    get DOMConversionMap() {
-        const self = this;
-
-        return {
-            blockquote: () => ({
-                conversion(domNode) {
-                    const isBigQuote = domNode.classList?.contains('kg-blockquote-alt');
-                    if (domNode.tagName === 'BLOCKQUOTE' && isBigQuote) {
-                        const node = new self.NodeClass();
-                        return {node};
-                    }
-
-                    return null;
-                },
-                priority: 0
-            })
-        };
-    }
-}
diff --git a/packages/kg-default-nodes/lib/nodes/aside/aside-parser.ts b/packages/kg-default-nodes/lib/nodes/aside/aside-parser.ts
new file mode 100644
index 0000000000..b558cd7c3c
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/aside/aside-parser.ts
@@ -0,0 +1,20 @@
+import {$createAsideNode} from './AsideNode';
+
+export function parseAsideNode() {
+    return {
+        blockquote: (nodeElem: HTMLElement) => {
+            const isBigQuote = nodeElem.classList?.contains('kg-blockquote-alt');
+            if (nodeElem.tagName === 'BLOCKQUOTE' && isBigQuote) {
+                return {
+                    conversion() {
+                        const node = $createAsideNode();
+                        return {node};
+                    },
+                    priority: 0
+                };
+            }
+
+            return null;
+        }
+    };
+}
\ No newline at end of file
diff --git a/packages/kg-default-nodes/lib/nodes/button/button-parser.js b/packages/kg-default-nodes/lib/nodes/button/button-parser.ts
similarity index 52%
rename from packages/kg-default-nodes/lib/nodes/button/button-parser.js
rename to packages/kg-default-nodes/lib/nodes/button/button-parser.ts
index 7e6e326f1b..bb4a49f0d0 100644
--- a/packages/kg-default-nodes/lib/nodes/button/button-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/button/button-parser.ts
@@ -1,10 +1,17 @@
-export function parseButtonNode(ButtonNode) {
+import { DOMConversion, DOMConversionMap, DOMConversionOutput } from "lexical";
+import { $createButtonNode } from "./ButtonNode";
+import { KoenigDecoratorNode } from "../../KoenigDecoratorNode";
+
+// TODO: This is a workaround for the moment until we can get the generator fn output to be recognized as an extended KoenigDecoratorNode
+type ButtonNode = KoenigDecoratorNode;
+
+export const parseButtonNode = (ButtonNode: ButtonNode): DOMConversionMap | null => {
     return {
-        div: (nodeElem) => {
+        div: (nodeElem: HTMLElement): DOMConversion | null => {
             const isButtonCard = nodeElem.classList?.contains('kg-button-card');
             if (nodeElem.tagName === 'DIV' && isButtonCard) {
                 return {
-                    conversion(domNode) {
+                    conversion(domNode: HTMLElement): DOMConversionOutput {
                         const alignmentClass = nodeElem.className.match(/kg-align-(left|center)/);
 
                         let alignment;
@@ -13,8 +20,8 @@ export function parseButtonNode(ButtonNode) {
                         }
 
                         const buttonNode = domNode?.querySelector('.kg-btn');
-                        const buttonUrl = buttonNode.getAttribute('href');
-                        const buttonText = buttonNode.textContent;
+                        const buttonUrl = buttonNode?.getAttribute('href');
+                        const buttonText = buttonNode?.textContent;
 
                         const payload = {
                             buttonText: buttonText,
@@ -22,7 +29,7 @@ export function parseButtonNode(ButtonNode) {
                             buttonUrl: buttonUrl
                         };
 
-                        const node = new ButtonNode(payload);
+                        const node = $createButtonNode(payload) as ButtonNode;
                         return {node};
                     },
                     priority: 1

From 9482df121497c045bcf92be39fc3cbd4437f748f Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 7 Feb 2024 08:37:15 -0600
Subject: [PATCH 08/33] update audio parser

---
 .../lib/nodes/audio/AudioNode.js              |  2 +-
 .../{audio-parser.js => audio-parser.ts}      | 30 ++++++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)
 rename packages/kg-default-nodes/lib/nodes/audio/{audio-parser.js => audio-parser.ts} (59%)

diff --git a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.js b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.js
index cc4dce06dd..936c0232d1 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.js
+++ b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.js
@@ -13,7 +13,7 @@ export class AudioNode extends generateDecoratorNode({nodeType: 'audio',
     ]}
 ) {
     static importDOM() {
-        return parseAudioNode(this);
+        return parseAudioNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/audio/audio-parser.js b/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
similarity index 59%
rename from packages/kg-default-nodes/lib/nodes/audio/audio-parser.js
rename to packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
index 2ffcf27d22..d469af8afa 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/audio-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
@@ -1,19 +1,33 @@
-export function parseAudioNode(AudioNode) {
+import { DOMConversion, DOMConversionMap, DOMConversionOutput } from "lexical";
+import { $createAudioNode } from "./AudioNode";
+import { KoenigDecoratorNode } from "../../KoenigDecoratorNode";
+
+// TODO: This is a workaround for the moment until we can get the generator fn output to be recognized as an extended KoenigDecoratorNode
+type AudioNode = KoenigDecoratorNode;
+
+type AudioPayload = {
+    src: string | null;
+    title: string | null;
+    thumbnailSrc?: string;
+    duration?: number;
+};
+
+export function parseAudioNode(): DOMConversionMap | null {
     return {
-        div: (nodeElem) => {
+        div: (nodeElem: HTMLElement): DOMConversion | null => {
             const isKgAudioCard = nodeElem.classList?.contains('kg-audio-card');
             if (nodeElem.tagName === 'DIV' && isKgAudioCard) {
                 return {
-                    conversion(domNode) {
+                    conversion(domNode: HTMLElement): DOMConversionOutput {
                         const titleNode = domNode?.querySelector('.kg-audio-title');
-                        const audioNode = domNode?.querySelector('.kg-audio-player-container audio');
+                        const audioNode = domNode?.querySelector('.kg-audio-player-container audio') as HTMLAudioElement | null;
                         const durationNode = domNode?.querySelector('.kg-audio-duration');
-                        const thumbnailNode = domNode?.querySelector('.kg-audio-thumbnail');
+                        const thumbnailNode = domNode?.querySelector('.kg-audio-thumbnail') as HTMLImageElement | null;
                         const title = titleNode && titleNode.innerHTML.trim();
                         const audioSrc = audioNode && audioNode.src;
                         const thumbnailSrc = thumbnailNode && thumbnailNode.src;
                         const durationText = durationNode && durationNode.innerHTML.trim();
-                        const payload = {
+                        const payload: AudioPayload = {
                             src: audioSrc,
                             title: title
                         };
@@ -22,7 +36,7 @@ export function parseAudioNode(AudioNode) {
                         }
 
                         if (durationText) {
-                            const [minutes, seconds = 0] = durationText.split(':');
+                            const [minutes, seconds = '0'] = durationText.split(':');
                             try {
                                 payload.duration = parseInt(minutes) * 60 + parseInt(seconds);
                             } catch (e) {
@@ -30,7 +44,7 @@ export function parseAudioNode(AudioNode) {
                             }
                         }
 
-                        const node = new AudioNode(payload);
+                        const node = $createAudioNode(payload) as AudioNode;
                         return {node};
                     },
                     priority: 1

From 1f4e49fb9c2793a9edeb8d781deebf199be5b0af Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 7 Feb 2024 09:10:24 -0600
Subject: [PATCH 09/33] wire up generator

---
 ...tor-node.js => generate-decorator-node.ts} | 139 ++++++++----------
 .../audio/{AudioNode.js => AudioNode.ts}      |   9 +-
 2 files changed, 72 insertions(+), 76 deletions(-)
 rename packages/kg-default-nodes/lib/{generate-decorator-node.js => generate-decorator-node.ts} (58%)
 rename packages/kg-default-nodes/lib/nodes/audio/{AudioNode.js => AudioNode.ts} (62%)

diff --git a/packages/kg-default-nodes/lib/generate-decorator-node.js b/packages/kg-default-nodes/lib/generate-decorator-node.ts
similarity index 58%
rename from packages/kg-default-nodes/lib/generate-decorator-node.js
rename to packages/kg-default-nodes/lib/generate-decorator-node.ts
index ba81ef8682..256257558f 100644
--- a/packages/kg-default-nodes/lib/generate-decorator-node.js
+++ b/packages/kg-default-nodes/lib/generate-decorator-node.ts
@@ -1,55 +1,75 @@
+import {NodeKey} from 'lexical';
 import {KoenigDecoratorNode} from './KoenigDecoratorNode';
 import readTextContent from './utils/read-text-content';
 /**
  * Validates the required arguments passed to `generateDecoratorNode`
+ * @see https://lexical.dev/docs/concepts/nodes#extending-decoratornode
 */
-function validateArguments(nodeType, properties) {
+
+// NOTE: There's some liberal use of 'any' in this file despite moving it to typescript. This is a difficult one to get right
+//  because we're generating classes.
+
+export type KoenigDecoratorProperty = {
+    name: string;
+    default?: number | string | boolean | null;
+    urlType?: 'url'|'html'|'markdown';
+    wordCount?: boolean;
+};
+
+export type KoenigDecoratorNodeProperties = KoenigDecoratorProperty[];
+
+function validateArguments(nodeType: string, properties: KoenigDecoratorNodeProperties) {
     /* eslint-disable ghost/ghost-custom/no-native-error */
     /* c8 ignore start */
     if (!nodeType) {
-        throw new Error({message: '[generateDecoratorNode] A unique "nodeType" should be provided'});
+        throw new Error('[generateDecoratorNode] A unique "nodeType" should be provided');
     }
 
     properties.forEach((prop) => {
         if (!('name' in prop) || !('default' in prop)){
-            throw new Error({message: '[generateDecoratorNode] Properties should have both "name" and "default" attributes.'});
+            throw new Error('[generateDecoratorNode] Properties should have both "name" and "default" attributes.');
         }
 
         if (prop.urlType && !['url', 'html', 'markdown'].includes(prop.urlType)) {
-            throw new Error({message: '[generateDecoratorNode] "urlType" should be either "url", "html" or "markdown"'});
+            throw new Error('[generateDecoratorNode] "urlType" should be either "url", "html" or "markdown"');
         }
 
         if ('wordCount' in prop && typeof prop.wordCount !== 'boolean') {
-            throw new Error({message: '[generateDecoratorNode] "wordCount" should be of boolean type.'});
+            throw new Error('[generateDecoratorNode] "wordCount" should be of boolean type.');
         }
     });
     /* c8 ignore stop */
 }
 
-/**
- * @typedef {Object} DecoratorNodeProperty
- * @property {string} name - The property's name.
- * @property {*} default - The property's default value
- * @property {('url'|'html'|'markdown'|null)} urlType - If the property contains a URL, the URL's type: 'url', 'html' or 'markdown'. Use 'url' is the property contains only a URL, 'html' or 'markdown' if the property contains HTML or markdown code, that may contain URLs.
- * @property {boolean} wordCount - Whether the property should be counted in the word count
- *
- * @param {string} nodeType – The node's type (must be unique)
- * @param {DecoratorNodeProperty[]} properties - An array of properties for the generated class
- * @returns {Object} - The generated class.
- */
-export function generateDecoratorNode({nodeType, properties = [], version = 1}) {
+// expand the properties to include a privateName field
+type PrivateKoenigProperty = KoenigDecoratorProperty & {privateName: string};
+
+type GenerateKoenigDecoratorNodeFn = (options: {
+    nodeType: string;
+    properties?: KoenigDecoratorNodeProperties;
+    version?: number;
+}) => typeof KoenigDecoratorNode;
+
+type SerializedKoenigDecoratorNode = {
+    type: string;
+    version: number;
+    [key: string]: any;
+};
+
+export const generateDecoratorNode: GenerateKoenigDecoratorNodeFn = ({nodeType, properties = [], version = 1}) => {
     validateArguments(nodeType, properties);
 
     // Adds a `privateName` field to the properties for convenience (e.g. `__name`):
     // properties: [{name: 'name', privateName: '__name', type: 'string', default: 'hello'}, {...}]
-    properties = properties.map((prop) => {
+    const __properties: PrivateKoenigProperty[] = properties.map((prop) => {
         return {...prop, privateName: `__${prop.name}`};
     });
 
     class GeneratedDecoratorNode extends KoenigDecoratorNode {
-        constructor(data = {}, key) {
+        // allow any type here for ease of use
+        constructor(data: any = {}, key?: NodeKey) {
             super(key);
-            properties.forEach((prop) => {
+            __properties.forEach((prop) => {
                 if (typeof prop.default === 'boolean') {
                     this[prop.privateName] = data[prop.name] ?? prop.default;
                 } else {
@@ -58,22 +78,11 @@ export function generateDecoratorNode({nodeType, properties = [], version = 1})
             });
         }
 
-        /**
-         * Returns the node's unique type
-         * @extends DecoratorNode
-         * @see https://lexical.dev/docs/concepts/nodes#extending-decoratornode
-         * @returns {string}
-         */
-        static getType() {
+        static getType(): string {
             return nodeType;
         }
 
-        /**
-         * Creates a copy of an existing node with all its properties
-         * @extends DecoratorNode
-         * @see https://lexical.dev/docs/concepts/nodes#extending-decoratornode
-         */
-        static clone(node) {
+        static clone(node: KoenigDecoratorNode) {
             return new this(node.getDataset(), node.__key);
         }
 
@@ -83,9 +92,9 @@ export function generateDecoratorNode({nodeType, properties = [], version = 1})
          * @see https://github.com/TryGhost/SDK/tree/main/packages/url-utils
          */
         static get urlTransformMap() {
-            let map = {};
+            let map: any = {};
 
-            properties.forEach((prop) => {
+            __properties.forEach((prop) => {
                 if (prop.urlType) {
                     map[prop.name] = prop.urlType;
                 }
@@ -101,8 +110,8 @@ export function generateDecoratorNode({nodeType, properties = [], version = 1})
         getDataset() {
             const self = this.getLatest();
 
-            let dataset = {};
-            properties.forEach((prop) => {
+            let dataset: any = {};
+            __properties.forEach((prop) => {
                 dataset[prop.name] = self[prop.privateName];
             });
 
@@ -115,10 +124,11 @@ export function generateDecoratorNode({nodeType, properties = [], version = 1})
          * @extends DecoratorNode
          * @param {Object} serializedNode - Lexical's representation of the node, in JSON format
          */
-        static importJSON(serializedNode) {
-            const data = {};
 
-            properties.forEach((prop) => {
+        static importJSON(serializedNode: SerializedKoenigDecoratorNode): KoenigDecoratorNode {
+            const data: any = {};
+
+            __properties.forEach((prop) => {
                 data[prop.name] = serializedNode[prop.name];
             });
 
@@ -130,11 +140,11 @@ export function generateDecoratorNode({nodeType, properties = [], version = 1})
          * @extends DecoratorNode
          * @see https://lexical.dev/docs/concepts/serialization#lexicalnodeexportjson
          */
-        exportJSON() {
+        exportJSON(): SerializedKoenigDecoratorNode {
             const dataset = {
                 type: nodeType,
                 version: version,
-                ...properties.reduce((obj, prop) => {
+                ...__properties.reduce((obj: any, prop) => {
                     obj[prop.name] = this[prop.name];
                     return obj;
                 }, {})
@@ -143,56 +153,37 @@ export function generateDecoratorNode({nodeType, properties = [], version = 1})
         }
 
         /* c8 ignore start */
-        /**
-         * Inserts node in the DOM. Required when extending the DecoratorNode.
-         * @extends DecoratorNode
-         * @see https://lexical.dev/docs/concepts/nodes#extending-decoratornode
-         */
-        createDOM() {
+        createDOM(): HTMLElement {
             return document.createElement('div');
         }
 
-        /**
-         * Required when extending the DecoratorNode
-         * @extends DecoratorNode
-         * @see https://lexical.dev/docs/concepts/nodes#extending-decoratornode
-         */
-        updateDOM() {
+        updateDOM(): false {
             return false;
         }
 
-        /**
-         * Defines whether a node is a top-level block.
-         * @see https://lexical.dev/docs/api/classes/lexical.DecoratorNode#isinline
-         */
-        isInline() {
+        // Defines whether a node is a top-level block.
+        isInline(): false {
             // All our cards are top-level blocks. Override if needed.
             return false;
         }
         /* c8 ignore stop */
 
-        /**
-         * Defines whether a node has dynamic data that needs to be fetched from the server when rendering
-         */
-        hasDynamicData() {
+        // Defines whether a node has dynamic data that needs to be fetched from the server when rendering
+        hasDynamicData(): false {
             return false;
         }
 
-        /**
-         * Defines whether a node has an edit mode in the editor UI
-         */
-        hasEditMode() {
+        // Defines whether a node has an edit mode in the editor UI
+        hasEditMode(): true {
             // Most of our cards have an edit mode. Override if needed.
             return true;
         }
 
-        /*
-        * Returns the text content of the node, used by the editor to calculate the word count
-        * This method filters out properties without `wordCount: true`
-        */
-        getTextContent() {
+        // Returns the text content of the node, used by the editor to calculate the word count
+        // This method filters out properties without `wordCount: true`
+        getTextContent(): string {
             const self = this.getLatest();
-            const propertiesWithText = properties.filter(prop => !!prop.wordCount);
+            const propertiesWithText = __properties.filter(prop => !!prop.wordCount);
 
             const text = propertiesWithText.map(
                 prop => readTextContent(self, prop.name)
@@ -220,7 +211,7 @@ export function generateDecoratorNode({nodeType, properties = [], version = 1})
      *
      * They can be used as `node.content` (getter) and `node.content = 'new value'` (setter)
      */
-    properties.forEach((prop) => {
+    __properties.forEach((prop) => {
         Object.defineProperty(GeneratedDecoratorNode.prototype, prop.name, {
             get: function () {
                 const self = this.getLatest();
diff --git a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.js b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
similarity index 62%
rename from packages/kg-default-nodes/lib/nodes/audio/AudioNode.js
rename to packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
index 936c0232d1..12a2c851a2 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.js
+++ b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
@@ -1,4 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
+import { LexicalNode } from 'lexical';
 import {generateDecoratorNode} from '../../generate-decorator-node';
 import {parseAudioNode} from './audio-parser';
 import {renderAudioNode} from './audio-renderer';
@@ -21,10 +22,14 @@ export class AudioNode extends generateDecoratorNode({nodeType: 'audio',
     }
 }
 
-export const $createAudioNode = (dataset) => {
+// TODO: Not sure how to handle the 'any' here; it's a result of the `generateDecoratorNode` function
+//  and the fact that the constructor is obscured, so it's pulling from the DecoratorNode class
+// 
+// Given that we call the $create methods in koenig-lexical, we really want to have type safety on the dataset properties
+export const $createAudioNode = (dataset: any) => {
     return new AudioNode(dataset);
 };
 
-export function $isAudioNode(node) {
+export function $isAudioNode(node: LexicalNode) {
     return node instanceof AudioNode;
 }

From 4e789855796fb5d8b83d5c7360fe8d0f8328e1af Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 7 Feb 2024 10:16:18 -0600
Subject: [PATCH 10/33] update generator class

---
 .../lib/generate-decorator-node.ts                 | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/kg-default-nodes/lib/generate-decorator-node.ts b/packages/kg-default-nodes/lib/generate-decorator-node.ts
index 256257558f..0f018cf5b8 100644
--- a/packages/kg-default-nodes/lib/generate-decorator-node.ts
+++ b/packages/kg-default-nodes/lib/generate-decorator-node.ts
@@ -44,11 +44,13 @@ function validateArguments(nodeType: string, properties: KoenigDecoratorNodeProp
 // expand the properties to include a privateName field
 type PrivateKoenigProperty = KoenigDecoratorProperty & {privateName: string};
 
-type GenerateKoenigDecoratorNodeFn = (options: {
+type GenerateKoenigDecoratorNodeFn = (options: GenerateKoenigDecoratorNodeOptions) => typeof GeneratedKoenigDecoratorNode;
+
+type GenerateKoenigDecoratorNodeOptions = {
     nodeType: string;
     properties?: KoenigDecoratorNodeProperties;
     version?: number;
-}) => typeof KoenigDecoratorNode;
+};
 
 type SerializedKoenigDecoratorNode = {
     type: string;
@@ -56,6 +58,14 @@ type SerializedKoenigDecoratorNode = {
     [key: string]: any;
 };
 
+class GeneratedKoenigDecoratorNode extends KoenigDecoratorNode {
+    
+    constructor(data: GenerateKoenigDecoratorNodeOptions) {
+        super();
+        this.generateDecoratorNode(data);
+    }
+}
+
 export const generateDecoratorNode: GenerateKoenigDecoratorNodeFn = ({nodeType, properties = [], version = 1}) => {
     validateArguments(nodeType, properties);
 

From 79426debd990fdef98292dee14fc3f1eef9fcefb Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 7 Feb 2024 10:22:14 -0600
Subject: [PATCH 11/33] update create audio node

---
 .../lib/nodes/audio/AudioNode.ts              | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
index 12a2c851a2..6f5f560220 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
@@ -1,9 +1,22 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import { LexicalNode } from 'lexical';
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseAudioNode} from './audio-parser';
 import {renderAudioNode} from './audio-renderer';
 
+type AudioNodeProperties = KoenigDecoratorNodeProperties & {
+    duration: number;
+    mimeType: string;
+    src: string;
+    title: string;
+    thumbnailSrc: string;
+};
+
+type AudioNodeDataset = {
+    nodeType: 'audio';
+    properties: AudioNodeProperties;
+};
+
 export class AudioNode extends generateDecoratorNode({nodeType: 'audio',
     properties: [
         {name: 'duration', default: 0},
@@ -26,7 +39,7 @@ export class AudioNode extends generateDecoratorNode({nodeType: 'audio',
 //  and the fact that the constructor is obscured, so it's pulling from the DecoratorNode class
 // 
 // Given that we call the $create methods in koenig-lexical, we really want to have type safety on the dataset properties
-export const $createAudioNode = (dataset: any) => {
+export const $createAudioNode = (dataset: AudioNodeDataset) => {
     return new AudioNode(dataset);
 };
 

From 6791f50f834e397b60d752b894399c0affc35188 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 7 Feb 2024 10:50:01 -0600
Subject: [PATCH 12/33] adjust dataset prop

---
 .../lib/generate-decorator-node.ts                 |  2 --
 .../kg-default-nodes/lib/nodes/audio/AudioNode.ts  | 14 +++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/kg-default-nodes/lib/generate-decorator-node.ts b/packages/kg-default-nodes/lib/generate-decorator-node.ts
index 0f018cf5b8..fa29ba0bcc 100644
--- a/packages/kg-default-nodes/lib/generate-decorator-node.ts
+++ b/packages/kg-default-nodes/lib/generate-decorator-node.ts
@@ -41,7 +41,6 @@ function validateArguments(nodeType: string, properties: KoenigDecoratorNodeProp
     /* c8 ignore stop */
 }
 
-// expand the properties to include a privateName field
 type PrivateKoenigProperty = KoenigDecoratorProperty & {privateName: string};
 
 type GenerateKoenigDecoratorNodeFn = (options: GenerateKoenigDecoratorNodeOptions) => typeof GeneratedKoenigDecoratorNode;
@@ -59,7 +58,6 @@ type SerializedKoenigDecoratorNode = {
 };
 
 class GeneratedKoenigDecoratorNode extends KoenigDecoratorNode {
-    
     constructor(data: GenerateKoenigDecoratorNodeOptions) {
         super();
         this.generateDecoratorNode(data);
diff --git a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
index 6f5f560220..c0769db560 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
@@ -5,16 +5,16 @@ import {parseAudioNode} from './audio-parser';
 import {renderAudioNode} from './audio-renderer';
 
 type AudioNodeProperties = KoenigDecoratorNodeProperties & {
-    duration: number;
-    mimeType: string;
-    src: string;
-    title: string;
-    thumbnailSrc: string;
+    duration?: number;
+    mimeType?: string;
+    src?: string;
+    title?: string;
+    thumbnailSrc?: string;
 };
 
 type AudioNodeDataset = {
     nodeType: 'audio';
-    properties: AudioNodeProperties;
+    properties?: AudioNodeProperties;
 };
 
 export class AudioNode extends generateDecoratorNode({nodeType: 'audio',
@@ -39,7 +39,7 @@ export class AudioNode extends generateDecoratorNode({nodeType: 'audio',
 //  and the fact that the constructor is obscured, so it's pulling from the DecoratorNode class
 // 
 // Given that we call the $create methods in koenig-lexical, we really want to have type safety on the dataset properties
-export const $createAudioNode = (dataset: AudioNodeDataset) => {
+export const $createAudioNode = (dataset: any) => {
     return new AudioNode(dataset);
 };
 

From 3fb90f2d2d40cdf0bb227184b873788152494d98 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 7 Feb 2024 11:33:33 -0600
Subject: [PATCH 13/33] upd

---
 .../lib/generate-decorator-node.ts            |  2 +-
 .../lib/nodes/audio/AudioNode.ts              | 35 ++++++++++---------
 .../lib/nodes/audio/audio-parser.ts           | 16 ++++-----
 packages/kg-default-nodes/package.json        |  1 +
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/kg-default-nodes/lib/generate-decorator-node.ts b/packages/kg-default-nodes/lib/generate-decorator-node.ts
index fa29ba0bcc..a3302886c6 100644
--- a/packages/kg-default-nodes/lib/generate-decorator-node.ts
+++ b/packages/kg-default-nodes/lib/generate-decorator-node.ts
@@ -57,7 +57,7 @@ type SerializedKoenigDecoratorNode = {
     [key: string]: any;
 };
 
-class GeneratedKoenigDecoratorNode extends KoenigDecoratorNode {
+export class GeneratedKoenigDecoratorNode extends KoenigDecoratorNode {
     constructor(data: GenerateKoenigDecoratorNodeOptions) {
         super();
         this.generateDecoratorNode(data);
diff --git a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
index c0769db560..5bde4e4751 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
@@ -1,10 +1,10 @@
 /* eslint-disable ghost/filenames/match-exported-class */
 import {LexicalNode} from 'lexical';
-import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
+import {GeneratedKoenigDecoratorNode} from '../../generate-decorator-node';
 import {parseAudioNode} from './audio-parser';
 import {renderAudioNode} from './audio-renderer';
 
-type AudioNodeProperties = KoenigDecoratorNodeProperties & {
+export type AudioNodeDataset = {
     duration?: number;
     mimeType?: string;
     src?: string;
@@ -12,20 +12,23 @@ type AudioNodeProperties = KoenigDecoratorNodeProperties & {
     thumbnailSrc?: string;
 };
 
-type AudioNodeDataset = {
-    nodeType: 'audio';
-    properties?: AudioNodeProperties;
-};
+export class AudioNode extends GeneratedKoenigDecoratorNode {
+
+    constructor(data: AudioNodeDataset) {
+        super(
+            {  
+                nodeType: 'audio',
+                properties: [
+                    {name: 'duration', default: 0},
+                    {name: 'mimeType', default: ''},
+                    {name: 'src', default: '', urlType: 'url'},
+                    {name: 'title', default: ''},
+                    {name: 'thumbnailSrc', default: ''} 
+                ]
+            }
+        );
+    }
 
-export class AudioNode extends generateDecoratorNode({nodeType: 'audio',
-    properties: [
-        {name: 'duration', default: 0},
-        {name: 'mimeType', default: ''},
-        {name: 'src', default: '', urlType: 'url'},
-        {name: 'title', default: ''},
-        {name: 'thumbnailSrc', default: ''}
-    ]}
-) {
     static importDOM() {
         return parseAudioNode();
     }
@@ -39,7 +42,7 @@ export class AudioNode extends generateDecoratorNode({nodeType: 'audio',
 //  and the fact that the constructor is obscured, so it's pulling from the DecoratorNode class
 // 
 // Given that we call the $create methods in koenig-lexical, we really want to have type safety on the dataset properties
-export const $createAudioNode = (dataset: any) => {
+export const $createAudioNode = (dataset: AudioNodeDataset) => {
     return new AudioNode(dataset);
 };
 
diff --git a/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts b/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
index d469af8afa..7a5ca3c57b 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
+++ b/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
@@ -1,16 +1,10 @@
 import { DOMConversion, DOMConversionMap, DOMConversionOutput } from "lexical";
-import { $createAudioNode } from "./AudioNode";
+import { $createAudioNode, AudioNodeDataset } from "./AudioNode";
 import { KoenigDecoratorNode } from "../../KoenigDecoratorNode";
 
 // TODO: This is a workaround for the moment until we can get the generator fn output to be recognized as an extended KoenigDecoratorNode
 type AudioNode = KoenigDecoratorNode;
 
-type AudioPayload = {
-    src: string | null;
-    title: string | null;
-    thumbnailSrc?: string;
-    duration?: number;
-};
 
 export function parseAudioNode(): DOMConversionMap | null {
     return {
@@ -27,10 +21,12 @@ export function parseAudioNode(): DOMConversionMap | null {
                         const audioSrc = audioNode && audioNode.src;
                         const thumbnailSrc = thumbnailNode && thumbnailNode.src;
                         const durationText = durationNode && durationNode.innerHTML.trim();
-                        const payload: AudioPayload = {
-                            src: audioSrc,
-                            title: title
+                        
+                        const payload: AudioNodeDataset = {
+                            src: audioSrc || undefined,
+                            title: title || undefined
                         };
+
                         if (thumbnailSrc) {
                             payload.thumbnailSrc = thumbnailSrc;
                         }
diff --git a/packages/kg-default-nodes/package.json b/packages/kg-default-nodes/package.json
index 01956c7647..a0a49e8b1a 100644
--- a/packages/kg-default-nodes/package.json
+++ b/packages/kg-default-nodes/package.json
@@ -14,6 +14,7 @@
     "pretest": "yarn build",
     "test:unit": "NODE_ENV=testing c8 --lib --check-coverage --reporter text --reporter cobertura mocha './test/**/*.test.js'",
     "test": "yarn test:unit",
+    "test:noc8": "NODE_ENV=testing mocha './test/**/*.test.js'",
     "lint:code": "eslint *.js lib/ --ext .js --cache && eslint *.ts lib/ --ext .ts --cache",
     "lint": "yarn lint:code && yarn lint:test",
     "lint:test": "eslint -c test/.eslintrc.js test/ --ext .js --cache"

From bc47e1e83fff024ebe9669e7b9474dfc76d92a33 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 7 Feb 2024 12:01:42 -0600
Subject: [PATCH 14/33] update linter

---
 packages/kg-default-nodes/.eslintrc.js        | 19 +++++++------------
 .../lib/generate-decorator-node.ts            | 13 +++++++++----
 .../lib/nodes/ExtendedHeadingNode.ts          |  2 +-
 .../lib/nodes/ExtendedQuoteNode.ts            |  2 +-
 .../lib/nodes/ExtendedTextNode.ts             |  2 +-
 packages/kg-default-nodes/lib/nodes/TKNode.ts |  2 +-
 .../lib/nodes/audio/AudioNode.ts              |  2 +-
 .../lib/nodes/audio/audio-parser.ts           |  7 +++----
 .../lib/nodes/button/button-parser.ts         | 10 +++++-----
 packages/kg-default-nodes/package.json        |  2 +-
 10 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/packages/kg-default-nodes/.eslintrc.js b/packages/kg-default-nodes/.eslintrc.js
index fafc2745fc..c1aed6b951 100644
--- a/packages/kg-default-nodes/.eslintrc.js
+++ b/packages/kg-default-nodes/.eslintrc.js
@@ -1,20 +1,15 @@
 module.exports = {
     plugins: ['ghost'],
     extends: [
-        'plugin:ghost/node'
+        'plugin:ghost/node',
+        'plugin:ghost/ts'
     ],
-    parser: '@babel/eslint-parser',
-    parserOptions: {
-        sourceType: 'module',
-        requireConfigFile: false,
-        babelOptions: {
-            plugins: [
-                '@babel/plugin-syntax-import-assertions'
-            ]
-        }
-    },
     env: {
         browser: true,
         node: true
+    },
+    // this fouls up with Lexical's need to prefix with '$' for lifecycle hooks
+    rules: {
+        'ghost/filenames/match-exported-class': 'off'
     }
-};
+};
\ No newline at end of file
diff --git a/packages/kg-default-nodes/lib/generate-decorator-node.ts b/packages/kg-default-nodes/lib/generate-decorator-node.ts
index a3302886c6..586cca534b 100644
--- a/packages/kg-default-nodes/lib/generate-decorator-node.ts
+++ b/packages/kg-default-nodes/lib/generate-decorator-node.ts
@@ -54,6 +54,7 @@ type GenerateKoenigDecoratorNodeOptions = {
 type SerializedKoenigDecoratorNode = {
     type: string;
     version: number;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     [key: string]: any;
 };
 
@@ -75,6 +76,7 @@ export const generateDecoratorNode: GenerateKoenigDecoratorNodeFn = ({nodeType,
 
     class GeneratedDecoratorNode extends KoenigDecoratorNode {
         // allow any type here for ease of use
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         constructor(data: any = {}, key?: NodeKey) {
             super(key);
             __properties.forEach((prop) => {
@@ -100,7 +102,8 @@ export const generateDecoratorNode: GenerateKoenigDecoratorNodeFn = ({nodeType,
          * @see https://github.com/TryGhost/SDK/tree/main/packages/url-utils
          */
         static get urlTransformMap() {
-            let map: any = {};
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const map: any = {};
 
             __properties.forEach((prop) => {
                 if (prop.urlType) {
@@ -117,8 +120,8 @@ export const generateDecoratorNode: GenerateKoenigDecoratorNodeFn = ({nodeType,
          */
         getDataset() {
             const self = this.getLatest();
-
-            let dataset: any = {};
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const dataset: any = {};
             __properties.forEach((prop) => {
                 dataset[prop.name] = self[prop.privateName];
             });
@@ -134,6 +137,7 @@ export const generateDecoratorNode: GenerateKoenigDecoratorNodeFn = ({nodeType,
          */
 
         static importJSON(serializedNode: SerializedKoenigDecoratorNode): KoenigDecoratorNode {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const data: any = {};
 
             __properties.forEach((prop) => {
@@ -152,6 +156,7 @@ export const generateDecoratorNode: GenerateKoenigDecoratorNodeFn = ({nodeType,
             const dataset = {
                 type: nodeType,
                 version: version,
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 ...__properties.reduce((obj: any, prop) => {
                     obj[prop.name] = this[prop.name];
                     return obj;
@@ -233,4 +238,4 @@ export const generateDecoratorNode: GenerateKoenigDecoratorNodeFn = ({nodeType,
     });
 
     return GeneratedDecoratorNode;
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts b/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
index 2fd169bbce..4598e40bf6 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
@@ -32,7 +32,7 @@ export class ExtendedHeadingNode extends HeadingNode {
         return {
             ...importers,
             p: patchParagraphConversion(importers?.p)
-        }
+        };
     }
 
     static importJSON(serializedNode: SerializedHeadingNode): ExtendedHeadingNode {
diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts b/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
index 2dacb5ed59..68c0a58c56 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
@@ -1,6 +1,6 @@
 /* eslint-disable ghost/filenames/match-exported-class */
 import {QuoteNode, SerializedQuoteNode} from '@lexical/rich-text';
-import {$createLineBreakNode, $isParagraphNode, DOMConversion, DOMConversionMap, DOMConversionOutput, LexicalNode, NodeKey} from 'lexical';
+import {$createLineBreakNode, $isParagraphNode, DOMConversion, DOMConversionMap, LexicalNode, NodeKey} from 'lexical';
 
 // Since the QuoteNode is foundational to Lexical rich-text, only using a
 // custom QuoteNode is undesirable as it means every package would need to
diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts b/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
index 8872d5516c..a5ad81d556 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {$isTextNode, DOMChildConversion, DOMConversion, DOMConversionFn, DOMConversionMap, LexicalNode, NodeKey, SerializedTextNode, TextNode} from 'lexical';
+import {$isTextNode, DOMConversionFn, DOMConversionMap, NodeKey, SerializedTextNode, TextNode} from 'lexical';
 
 // Since the TextNode is foundational to all Lexical packages, including the
 // plain text use case. Handling any rich text logic is undesirable. This creates
diff --git a/packages/kg-default-nodes/lib/nodes/TKNode.ts b/packages/kg-default-nodes/lib/nodes/TKNode.ts
index 5b1313972c..07e57b11c8 100644
--- a/packages/kg-default-nodes/lib/nodes/TKNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/TKNode.ts
@@ -19,7 +19,7 @@ export class TKNode extends TextNode {
         const element = super.createDOM(config);
         const classes = config.theme.tk?.split(' ') || [];
         element.classList.add(...classes);
-        element.dataset.kgTk = "true";
+        element.dataset.kgTk = 'true';
         return element;
     }
 
diff --git a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
index 5bde4e4751..26bc344843 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
@@ -13,7 +13,7 @@ export type AudioNodeDataset = {
 };
 
 export class AudioNode extends GeneratedKoenigDecoratorNode {
-
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     constructor(data: AudioNodeDataset) {
         super(
             {  
diff --git a/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts b/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
index 7a5ca3c57b..30aa304bfd 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
+++ b/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
@@ -1,11 +1,10 @@
-import { DOMConversion, DOMConversionMap, DOMConversionOutput } from "lexical";
-import { $createAudioNode, AudioNodeDataset } from "./AudioNode";
-import { KoenigDecoratorNode } from "../../KoenigDecoratorNode";
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {$createAudioNode, AudioNodeDataset} from './AudioNode';
+import {KoenigDecoratorNode} from '../../KoenigDecoratorNode';
 
 // TODO: This is a workaround for the moment until we can get the generator fn output to be recognized as an extended KoenigDecoratorNode
 type AudioNode = KoenigDecoratorNode;
 
-
 export function parseAudioNode(): DOMConversionMap | null {
     return {
         div: (nodeElem: HTMLElement): DOMConversion | null => {
diff --git a/packages/kg-default-nodes/lib/nodes/button/button-parser.ts b/packages/kg-default-nodes/lib/nodes/button/button-parser.ts
index bb4a49f0d0..1b4427deb5 100644
--- a/packages/kg-default-nodes/lib/nodes/button/button-parser.ts
+++ b/packages/kg-default-nodes/lib/nodes/button/button-parser.ts
@@ -1,11 +1,11 @@
-import { DOMConversion, DOMConversionMap, DOMConversionOutput } from "lexical";
-import { $createButtonNode } from "./ButtonNode";
-import { KoenigDecoratorNode } from "../../KoenigDecoratorNode";
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {$createButtonNode} from './ButtonNode';
+import {KoenigDecoratorNode} from '../../KoenigDecoratorNode';
 
 // TODO: This is a workaround for the moment until we can get the generator fn output to be recognized as an extended KoenigDecoratorNode
 type ButtonNode = KoenigDecoratorNode;
 
-export const parseButtonNode = (ButtonNode: ButtonNode): DOMConversionMap | null => {
+export const parseButtonNode = (): DOMConversionMap | null => {
     return {
         div: (nodeElem: HTMLElement): DOMConversion | null => {
             const isButtonCard = nodeElem.classList?.contains('kg-button-card');
@@ -38,4 +38,4 @@ export const parseButtonNode = (ButtonNode: ButtonNode): DOMConversionMap | null
             return null;
         }
     };
-}
+};
diff --git a/packages/kg-default-nodes/package.json b/packages/kg-default-nodes/package.json
index a0a49e8b1a..e36d6841c8 100644
--- a/packages/kg-default-nodes/package.json
+++ b/packages/kg-default-nodes/package.json
@@ -15,7 +15,7 @@
     "test:unit": "NODE_ENV=testing c8 --lib --check-coverage --reporter text --reporter cobertura mocha './test/**/*.test.js'",
     "test": "yarn test:unit",
     "test:noc8": "NODE_ENV=testing mocha './test/**/*.test.js'",
-    "lint:code": "eslint *.js lib/ --ext .js --cache && eslint *.ts lib/ --ext .ts --cache",
+    "lint:code": "eslint lib/ --ext .js --cache && eslint lib/ --ext .ts --cache",
     "lint": "yarn lint:code && yarn lint:test",
     "lint:test": "eslint -c test/.eslintrc.js test/ --ext .js --cache"
   },

From 796fc5082c37702078a3eb9a881040e2095a89fb Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 7 Feb 2024 12:02:29 -0600
Subject: [PATCH 15/33] drop to ts 5.2.0 to support ghost ts linter

---
 packages/kg-default-nodes/package.json | 2 +-
 yarn.lock                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kg-default-nodes/package.json b/packages/kg-default-nodes/package.json
index e36d6841c8..267924ad79 100644
--- a/packages/kg-default-nodes/package.json
+++ b/packages/kg-default-nodes/package.json
@@ -43,7 +43,7 @@
     "rollup": "4.9.5",
     "should": "13.2.3",
     "sinon": "17.0.1",
-    "typescript": "^5.3.3"
+    "typescript": "^5.2.0"
   },
   "dependencies": {
     "@lexical/clipboard": "0.12.2",
diff --git a/yarn.lock b/yarn.lock
index 47e6591164..fa97176d34 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19043,7 +19043,7 @@ typescript@5.2.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
   integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
-typescript@5.3.3, "typescript@>=3 < 6", typescript@^5.3.3:
+typescript@5.3.3, "typescript@>=3 < 6", typescript@^5.2.0:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==

From 35941db48182139fa2e7394dd76ad63c34009387 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Thu, 8 Feb 2024 11:16:18 -0600
Subject: [PATCH 16/33] revert constructor changes, weren't actually working

- tsc wasn't running with test:noc8
---
 .../lib/nodes/audio/AudioNode.ts              | 32 ++++++++-----------
 packages/kg-default-nodes/package.json        |  2 +-
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
index 26bc344843..a5681aa6b0 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
@@ -1,6 +1,6 @@
 /* eslint-disable ghost/filenames/match-exported-class */
 import {LexicalNode} from 'lexical';
-import {GeneratedKoenigDecoratorNode} from '../../generate-decorator-node';
+import {generateDecoratorNode} from '../../generate-decorator-node';
 import {parseAudioNode} from './audio-parser';
 import {renderAudioNode} from './audio-renderer';
 
@@ -12,23 +12,18 @@ export type AudioNodeDataset = {
     thumbnailSrc?: string;
 };
 
-export class AudioNode extends GeneratedKoenigDecoratorNode {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    constructor(data: AudioNodeDataset) {
-        super(
-            {  
-                nodeType: 'audio',
-                properties: [
-                    {name: 'duration', default: 0},
-                    {name: 'mimeType', default: ''},
-                    {name: 'src', default: '', urlType: 'url'},
-                    {name: 'title', default: ''},
-                    {name: 'thumbnailSrc', default: ''} 
-                ]
-            }
-        );
+export class AudioNode extends generateDecoratorNode(
+    {
+        nodeType: 'audio',
+        properties: [
+            {name: 'duration', default: 0},
+            {name: 'mimeType', default: ''},
+            {name: 'src', default: '', urlType: 'url'},
+            {name: 'title', default: ''},
+            {name: 'thumbnailSrc', default: ''}
+        ]
     }
-
+) {
     static importDOM() {
         return parseAudioNode();
     }
@@ -42,7 +37,8 @@ export class AudioNode extends GeneratedKoenigDecoratorNode {
 //  and the fact that the constructor is obscured, so it's pulling from the DecoratorNode class
 // 
 // Given that we call the $create methods in koenig-lexical, we really want to have type safety on the dataset properties
-export const $createAudioNode = (dataset: AudioNodeDataset) => {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const $createAudioNode = (dataset: any) => {
     return new AudioNode(dataset);
 };
 
diff --git a/packages/kg-default-nodes/package.json b/packages/kg-default-nodes/package.json
index 267924ad79..50b1463095 100644
--- a/packages/kg-default-nodes/package.json
+++ b/packages/kg-default-nodes/package.json
@@ -14,7 +14,7 @@
     "pretest": "yarn build",
     "test:unit": "NODE_ENV=testing c8 --lib --check-coverage --reporter text --reporter cobertura mocha './test/**/*.test.js'",
     "test": "yarn test:unit",
-    "test:noc8": "NODE_ENV=testing mocha './test/**/*.test.js'",
+    "test:noc8": "tsc && NODE_ENV=testing mocha './test/**/*.test.js'",
     "lint:code": "eslint lib/ --ext .js --cache && eslint lib/ --ext .ts --cache",
     "lint": "yarn lint:code && yarn lint:test",
     "lint:test": "eslint -c test/.eslintrc.js test/ --ext .js --cache"

From fda4b132a5ac2885074e697c1dc4e88ac4a41104 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Thu, 8 Feb 2024 13:32:58 -0600
Subject: [PATCH 17/33] fix decorator node generation and dataset type

---
 .../lib/generate-decorator-node.ts            |  6 ++-
 .../lib/nodes/audio/AudioNode.ts              | 40 ++++++++++---------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/packages/kg-default-nodes/lib/generate-decorator-node.ts b/packages/kg-default-nodes/lib/generate-decorator-node.ts
index 586cca534b..8d19d0eb6e 100644
--- a/packages/kg-default-nodes/lib/generate-decorator-node.ts
+++ b/packages/kg-default-nodes/lib/generate-decorator-node.ts
@@ -59,7 +59,8 @@ type SerializedKoenigDecoratorNode = {
 };
 
 export class GeneratedKoenigDecoratorNode extends KoenigDecoratorNode {
-    constructor(data: GenerateKoenigDecoratorNodeOptions) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    constructor(data: any) {
         super();
         this.generateDecoratorNode(data);
     }
@@ -70,7 +71,8 @@ export const generateDecoratorNode: GenerateKoenigDecoratorNodeFn = ({nodeType,
 
     // Adds a `privateName` field to the properties for convenience (e.g. `__name`):
     // properties: [{name: 'name', privateName: '__name', type: 'string', default: 'hello'}, {...}]
-    const __properties: PrivateKoenigProperty[] = properties.map((prop) => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const __properties: PrivateKoenigProperty[] = properties.map((prop: any) => {
         return {...prop, privateName: `__${prop.name}`};
     });
 
diff --git a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
index a5681aa6b0..71399d3a94 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
@@ -1,6 +1,6 @@
 /* eslint-disable ghost/filenames/match-exported-class */
 import {LexicalNode} from 'lexical';
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {generateDecoratorNode, KoenigDecoratorNodeProperties} from '../../generate-decorator-node';
 import {parseAudioNode} from './audio-parser';
 import {renderAudioNode} from './audio-renderer';
 
@@ -12,18 +12,27 @@ export type AudioNodeDataset = {
     thumbnailSrc?: string;
 };
 
-export class AudioNode extends generateDecoratorNode(
-    {
-        nodeType: 'audio',
-        properties: [
-            {name: 'duration', default: 0},
-            {name: 'mimeType', default: ''},
-            {name: 'src', default: '', urlType: 'url'},
-            {name: 'title', default: ''},
-            {name: 'thumbnailSrc', default: ''}
-        ]
+type AudioNodeProps = {
+    nodeType: 'audio';
+    properties: KoenigDecoratorNodeProperties
+};
+
+const audioNodeProps: AudioNodeProps = {
+    nodeType: 'audio',
+    properties: [
+        {name: 'duration', default: 0},
+        {name: 'mimeType', default: ''},
+        {name: 'src', default: '', urlType: 'url'},
+        {name: 'title', default: ''},
+        {name: 'thumbnailSrc', default: ''}
+    ]
+};
+
+export class AudioNode extends generateDecoratorNode(audioNodeProps) {
+    constructor(dataset: AudioNodeDataset) {
+        super(dataset);    
     }
-) {
+
     static importDOM() {
         return parseAudioNode();
     }
@@ -33,12 +42,7 @@ export class AudioNode extends generateDecoratorNode(
     }
 }
 
-// TODO: Not sure how to handle the 'any' here; it's a result of the `generateDecoratorNode` function
-//  and the fact that the constructor is obscured, so it's pulling from the DecoratorNode class
-// 
-// Given that we call the $create methods in koenig-lexical, we really want to have type safety on the dataset properties
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const $createAudioNode = (dataset: any) => {
+export const $createAudioNode = (dataset: AudioNodeDataset) => {
     return new AudioNode(dataset);
 };
 

From 8822d9c88e4766f9fbdbe7c2a20cedcdf9eee552 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Thu, 8 Feb 2024 13:41:26 -0600
Subject: [PATCH 18/33] remove any

---
 packages/kg-default-nodes/lib/generate-decorator-node.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/kg-default-nodes/lib/generate-decorator-node.ts b/packages/kg-default-nodes/lib/generate-decorator-node.ts
index 8d19d0eb6e..a12edc8810 100644
--- a/packages/kg-default-nodes/lib/generate-decorator-node.ts
+++ b/packages/kg-default-nodes/lib/generate-decorator-node.ts
@@ -71,8 +71,7 @@ export const generateDecoratorNode: GenerateKoenigDecoratorNodeFn = ({nodeType,
 
     // Adds a `privateName` field to the properties for convenience (e.g. `__name`):
     // properties: [{name: 'name', privateName: '__name', type: 'string', default: 'hello'}, {...}]
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const __properties: PrivateKoenigProperty[] = properties.map((prop: any) => {
+    const __properties: PrivateKoenigProperty[] = properties.map((prop) => {
         return {...prop, privateName: `__${prop.name}`};
     });
 

From 5e9a022e14507a6312c921bae131a9b17fbccd2c Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Thu, 8 Feb 2024 13:46:12 -0600
Subject: [PATCH 19/33] add notes

---
 packages/kg-default-nodes/lib/generate-decorator-node.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/kg-default-nodes/lib/generate-decorator-node.ts b/packages/kg-default-nodes/lib/generate-decorator-node.ts
index a12edc8810..1b98ec2a1d 100644
--- a/packages/kg-default-nodes/lib/generate-decorator-node.ts
+++ b/packages/kg-default-nodes/lib/generate-decorator-node.ts
@@ -43,6 +43,9 @@ function validateArguments(nodeType: string, properties: KoenigDecoratorNodeProp
 
 type PrivateKoenigProperty = KoenigDecoratorProperty & {privateName: string};
 
+// NOTE: This is really what the return type is, but we wrap it in the GeneratedKoenigDecoratorNode class to make it a bit easier to interpret
+//   the 'magic' behind the scenes that generates the KoenigDecoratorNode classes.
+// type GenerateKoenigDecoratorNodeFn = (options: GenerateKoenigDecoratorNodeOptions) => typeof generateDecoratorNode.prototype;
 type GenerateKoenigDecoratorNodeFn = (options: GenerateKoenigDecoratorNodeOptions) => typeof GeneratedKoenigDecoratorNode;
 
 type GenerateKoenigDecoratorNodeOptions = {
@@ -57,15 +60,13 @@ type SerializedKoenigDecoratorNode = {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     [key: string]: any;
 };
-
-export class GeneratedKoenigDecoratorNode extends KoenigDecoratorNode {
+class GeneratedKoenigDecoratorNode extends KoenigDecoratorNode {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     constructor(data: any) {
         super();
         this.generateDecoratorNode(data);
     }
 }
-
 export const generateDecoratorNode: GenerateKoenigDecoratorNodeFn = ({nodeType, properties = [], version = 1}) => {
     validateArguments(nodeType, properties);
 

From 406cece6ce1c4a959cfd12aebac5035c689f1376 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Thu, 8 Feb 2024 16:20:45 -0600
Subject: [PATCH 20/33] update nodes

---
 .../lib/generate-decorator-node.ts            |  4 +-
 .../lib/nodes/audio/AudioNode.ts              |  4 +-
 .../{BookmarkNode.js => BookmarkNode.ts}      | 46 ++++++++++++-----
 .../lib/nodes/button/ButtonNode.js            | 28 -----------
 .../lib/nodes/button/ButtonNode.ts            | 47 ++++++++++++++++++
 .../lib/nodes/button/button-parser.ts         |  6 +--
 .../{CalloutNode.js => CalloutNode.ts}        | 35 +++++++++----
 .../{CodeBlockNode.js => CodeBlockNode.ts}    | 27 +++++++---
 .../{CollectionNode.js => CollectionNode.ts}  | 33 ++++++++++---
 .../lib/nodes/email-cta/EmailCtaNode.js       | 27 ----------
 .../lib/nodes/email-cta/EmailCtaNode.ts       | 47 ++++++++++++++++++
 .../lib/nodes/email/EmailNode.js              | 21 --------
 .../lib/nodes/email/EmailNode.ts              | 34 +++++++++++++
 .../embed/{EmbedNode.js => EmbedNode.ts}      | 29 ++++++++---
 .../nodes/file/{FileNode.js => FileNode.ts}   | 40 +++++++++++----
 .../{GalleryNode.js => GalleryNode.ts}        | 30 +++++++++---
 ...ontalRuleNode.js => HorizontalRuleNode.ts} | 13 ++++-
 .../lib/nodes/html/HtmlNode.js                | 30 ------------
 .../lib/nodes/html/HtmlNode.ts                | 43 ++++++++++++++++
 .../image/{ImageNode.js => ImageNode.ts}      | 33 ++++++++++---
 .../lib/nodes/markdown/MarkdownNode.js        | 25 ----------
 .../lib/nodes/markdown/MarkdownNode.ts        | 38 ++++++++++++++
 .../{PaywallNode.js => PaywallNode.ts}        | 19 +++++--
 .../{ProductNode.js => ProductNode.ts}        | 36 +++++++++++---
 .../signup/{SignupNode.js => SignupNode.ts}   | 49 ++++++++++++++-----
 .../lib/nodes/toggle/ToggleNode.js            | 27 ----------
 .../lib/nodes/toggle/ToggleNode.ts            | 41 ++++++++++++++++
 .../video/{VideoNode.js => VideoNode.ts}      | 38 +++++++++++---
 .../kg-default-nodes/test/nodes/file.test.js  |  1 +
 29 files changed, 592 insertions(+), 259 deletions(-)
 rename packages/kg-default-nodes/lib/nodes/bookmark/{BookmarkNode.js => BookmarkNode.ts} (67%)
 delete mode 100644 packages/kg-default-nodes/lib/nodes/button/ButtonNode.js
 create mode 100644 packages/kg-default-nodes/lib/nodes/button/ButtonNode.ts
 rename packages/kg-default-nodes/lib/nodes/callout/{CalloutNode.js => CalloutNode.ts} (52%)
 rename packages/kg-default-nodes/lib/nodes/codeblock/{CodeBlockNode.js => CodeBlockNode.ts} (50%)
 rename packages/kg-default-nodes/lib/nodes/collection/{CollectionNode.js => CollectionNode.ts} (56%)
 delete mode 100644 packages/kg-default-nodes/lib/nodes/email-cta/EmailCtaNode.js
 create mode 100644 packages/kg-default-nodes/lib/nodes/email-cta/EmailCtaNode.ts
 delete mode 100644 packages/kg-default-nodes/lib/nodes/email/EmailNode.js
 create mode 100644 packages/kg-default-nodes/lib/nodes/email/EmailNode.ts
 rename packages/kg-default-nodes/lib/nodes/embed/{EmbedNode.js => EmbedNode.ts} (52%)
 rename packages/kg-default-nodes/lib/nodes/file/{FileNode.js => FileNode.ts} (58%)
 rename packages/kg-default-nodes/lib/nodes/gallery/{GalleryNode.js => GalleryNode.ts} (54%)
 rename packages/kg-default-nodes/lib/nodes/horizontalrule/{HorizontalRuleNode.js => HorizontalRuleNode.ts} (65%)
 delete mode 100644 packages/kg-default-nodes/lib/nodes/html/HtmlNode.js
 create mode 100644 packages/kg-default-nodes/lib/nodes/html/HtmlNode.ts
 rename packages/kg-default-nodes/lib/nodes/image/{ImageNode.js => ImageNode.ts} (66%)
 delete mode 100644 packages/kg-default-nodes/lib/nodes/markdown/MarkdownNode.js
 create mode 100644 packages/kg-default-nodes/lib/nodes/markdown/MarkdownNode.ts
 rename packages/kg-default-nodes/lib/nodes/paywall/{PaywallNode.js => PaywallNode.ts} (50%)
 rename packages/kg-default-nodes/lib/nodes/product/{ProductNode.js => ProductNode.ts} (69%)
 rename packages/kg-default-nodes/lib/nodes/signup/{SignupNode.js => SignupNode.ts} (72%)
 delete mode 100644 packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.js
 create mode 100644 packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.ts
 rename packages/kg-default-nodes/lib/nodes/video/{VideoNode.js => VideoNode.ts} (71%)

diff --git a/packages/kg-default-nodes/lib/generate-decorator-node.ts b/packages/kg-default-nodes/lib/generate-decorator-node.ts
index 1b98ec2a1d..0c0f03789e 100644
--- a/packages/kg-default-nodes/lib/generate-decorator-node.ts
+++ b/packages/kg-default-nodes/lib/generate-decorator-node.ts
@@ -11,7 +11,7 @@ import readTextContent from './utils/read-text-content';
 
 export type KoenigDecoratorProperty = {
     name: string;
-    default?: number | string | boolean | null;
+    default?: number | string | boolean | null | object;
     urlType?: 'url'|'html'|'markdown';
     wordCount?: boolean;
 };
@@ -62,7 +62,7 @@ type SerializedKoenigDecoratorNode = {
 };
 class GeneratedKoenigDecoratorNode extends KoenigDecoratorNode {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    constructor(data: any) {
+    constructor(data?: any) {
         super();
         this.generateDecoratorNode(data);
     }
diff --git a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
index 71399d3a94..2ad2d2fe7f 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/audio/AudioNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 import {generateDecoratorNode, KoenigDecoratorNodeProperties} from '../../generate-decorator-node';
 import {parseAudioNode} from './audio-parser';
 import {renderAudioNode} from './audio-renderer';
@@ -33,7 +33,7 @@ export class AudioNode extends generateDecoratorNode(audioNodeProps) {
         super(dataset);    
     }
 
-    static importDOM() {
+    static importDOM(): DOMConversionMap | null {
         return parseAudioNode();
     }
 
diff --git a/packages/kg-default-nodes/lib/nodes/bookmark/BookmarkNode.js b/packages/kg-default-nodes/lib/nodes/bookmark/BookmarkNode.ts
similarity index 67%
rename from packages/kg-default-nodes/lib/nodes/bookmark/BookmarkNode.js
rename to packages/kg-default-nodes/lib/nodes/bookmark/BookmarkNode.ts
index 2eb10fa9e3..711bbd35b8 100644
--- a/packages/kg-default-nodes/lib/nodes/bookmark/BookmarkNode.js
+++ b/packages/kg-default-nodes/lib/nodes/bookmark/BookmarkNode.ts
@@ -1,9 +1,31 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {LexicalNode, NodeKey, SerializedLexicalNode, Spread} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseBookmarkNode} from './bookmark-parser';
 import {renderBookmarkNode} from './bookmark-renderer';
 
-export class BookmarkNode extends generateDecoratorNode({nodeType: 'bookmark',
+export type BookmarkNodeDataset = {
+    url?: string;
+    metadata?: {
+        icon?: string;
+        title?: string;
+        description?: string;
+        author?: string;
+        publisher?: string;
+        thumbnail?: string;
+    };
+    caption?: string;
+};
+
+export type SerializedBookmarkNode = Spread<BookmarkNodeDataset, SerializedLexicalNode>;
+
+type BookmarkNodeProps = {
+    nodeType: 'bookmark';
+    properties: KoenigDecoratorNodeProperties
+};
+
+const bookmarkNodeProps: BookmarkNodeProps = {
+    nodeType: 'bookmark',
     properties: [
         {name: 'title', default: '', wordCount: true},
         {name: 'description', default: '', wordCount: true},
@@ -13,8 +35,10 @@ export class BookmarkNode extends generateDecoratorNode({nodeType: 'bookmark',
         {name: 'publisher', default: ''},
         {name: 'icon', default: '', urlType: 'url'},
         {name: 'thumbnail', default: '', urlType: 'url'}
-    ]}
-) {
+    ]
+};
+
+export class BookmarkNode extends generateDecoratorNode(bookmarkNodeProps) {
     static importDOM() {
         return parseBookmarkNode(this);
     }
@@ -24,7 +48,7 @@ export class BookmarkNode extends generateDecoratorNode({nodeType: 'bookmark',
     }
 
     /* override */
-    constructor({url, metadata, caption} = {}, key) {
+    constructor({url, metadata, caption}: BookmarkNodeDataset = {}, key?: NodeKey) {
         super(key);
         this.__url = url || '';
         this.__icon = metadata?.icon || '';
@@ -37,7 +61,7 @@ export class BookmarkNode extends generateDecoratorNode({nodeType: 'bookmark',
     }
 
     /* @override */
-    getDataset() {
+    getDataset(): BookmarkNodeDataset {
         const self = this.getLatest();
         return {
             url: self.__url,
@@ -54,7 +78,7 @@ export class BookmarkNode extends generateDecoratorNode({nodeType: 'bookmark',
     }
 
     /* @override */
-    static importJSON(serializedNode) {
+    static importJSON(serializedNode: SerializedBookmarkNode): BookmarkNode {
         const {url, metadata, caption} = serializedNode;
         const node = new this({
             url,
@@ -65,7 +89,7 @@ export class BookmarkNode extends generateDecoratorNode({nodeType: 'bookmark',
     }
 
     /* @override */
-    exportJSON() {
+    exportJSON(): SerializedBookmarkNode {
         const dataset = {
             type: 'bookmark',
             version: 1,
@@ -83,15 +107,15 @@ export class BookmarkNode extends generateDecoratorNode({nodeType: 'bookmark',
         return dataset;
     }
 
-    isEmpty() {
+    isEmpty(): boolean {
         return !this.url;
     }
 }
 
-export const $createBookmarkNode = (dataset) => {
+export const $createBookmarkNode = (dataset: BookmarkNodeDataset) => {
     return new BookmarkNode(dataset);
 };
 
-export function $isBookmarkNode(node) {
+export function $isBookmarkNode(node: LexicalNode) {
     return node instanceof BookmarkNode;
 }
diff --git a/packages/kg-default-nodes/lib/nodes/button/ButtonNode.js b/packages/kg-default-nodes/lib/nodes/button/ButtonNode.js
deleted file mode 100644
index 985e4bf4e9..0000000000
--- a/packages/kg-default-nodes/lib/nodes/button/ButtonNode.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
-import {parseButtonNode} from './button-parser';
-import {renderButtonNode} from './button-renderer';
-
-export class ButtonNode extends generateDecoratorNode({nodeType: 'button',
-    properties: [
-        {name: 'buttonText', default: ''},
-        {name: 'alignment', default: 'center'},
-        {name: 'buttonUrl', default: '', urlType: 'url'}
-    ]}
-) {
-    static importDOM() {
-        return parseButtonNode(this);
-    }
-
-    exportDOM(options = {}) {
-        return renderButtonNode(this, options);
-    }
-}
-
-export const $createButtonNode = (dataset) => {
-    return new ButtonNode(dataset);
-};
-
-export function $isButtonNode(node) {
-    return node instanceof ButtonNode;
-}
diff --git a/packages/kg-default-nodes/lib/nodes/button/ButtonNode.ts b/packages/kg-default-nodes/lib/nodes/button/ButtonNode.ts
new file mode 100644
index 0000000000..6ff6ca7bb7
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/button/ButtonNode.ts
@@ -0,0 +1,47 @@
+/* eslint-disable ghost/filenames/match-exported-class */
+import {DOMConversionMap, LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
+import {parseButtonNode} from './button-parser';
+import {renderButtonNode} from './button-renderer';
+
+export type ButtonNodeDataset = {
+    buttonText?: string | null;
+    alignment?: string | null;
+    buttonUrl?: string | null;
+};
+
+type ButtonNodeProps = {
+    nodeType: 'button';
+    properties: KoenigDecoratorNodeProperties
+};
+
+const buttonNodeProps: ButtonNodeProps = {
+    nodeType: 'button',
+    properties: [
+        {name: 'buttonText', default: ''},
+        {name: 'alignment', default: 'center'},
+        {name: 'buttonUrl', default: '', urlType: 'url'}
+    ]
+};
+
+export class ButtonNode extends generateDecoratorNode(buttonNodeProps) {
+    constructor(dataset: ButtonNodeDataset) {
+        super(dataset);    
+    }
+
+    static importDOM(): DOMConversionMap | null {
+        return parseButtonNode();
+    }
+
+    exportDOM(options = {}) {
+        return renderButtonNode(this, options);
+    }
+}
+
+export const $createButtonNode = (dataset: ButtonNodeDataset) => {
+    return new ButtonNode(dataset);
+};
+
+export function $isButtonNode(node: LexicalNode) {
+    return node instanceof ButtonNode;
+}
diff --git a/packages/kg-default-nodes/lib/nodes/button/button-parser.ts b/packages/kg-default-nodes/lib/nodes/button/button-parser.ts
index 1b4427deb5..861e28e521 100644
--- a/packages/kg-default-nodes/lib/nodes/button/button-parser.ts
+++ b/packages/kg-default-nodes/lib/nodes/button/button-parser.ts
@@ -1,9 +1,5 @@
 import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
 import {$createButtonNode} from './ButtonNode';
-import {KoenigDecoratorNode} from '../../KoenigDecoratorNode';
-
-// TODO: This is a workaround for the moment until we can get the generator fn output to be recognized as an extended KoenigDecoratorNode
-type ButtonNode = KoenigDecoratorNode;
 
 export const parseButtonNode = (): DOMConversionMap | null => {
     return {
@@ -29,7 +25,7 @@ export const parseButtonNode = (): DOMConversionMap | null => {
                             buttonUrl: buttonUrl
                         };
 
-                        const node = $createButtonNode(payload) as ButtonNode;
+                        const node = $createButtonNode(payload);
                         return {node};
                     },
                     priority: 1
diff --git a/packages/kg-default-nodes/lib/nodes/callout/CalloutNode.js b/packages/kg-default-nodes/lib/nodes/callout/CalloutNode.ts
similarity index 52%
rename from packages/kg-default-nodes/lib/nodes/callout/CalloutNode.js
rename to packages/kg-default-nodes/lib/nodes/callout/CalloutNode.ts
index 3caaae8fdc..4468ec51ec 100644
--- a/packages/kg-default-nodes/lib/nodes/callout/CalloutNode.js
+++ b/packages/kg-default-nodes/lib/nodes/callout/CalloutNode.ts
@@ -1,17 +1,32 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {renderCalloutNode} from './callout-renderer';
 import {parseCalloutNode} from './callout-parser';
+import {LexicalNode, NodeKey} from 'lexical';
 
-export class CalloutNode extends generateDecoratorNode({nodeType: 'callout',
+export type CalloutNodeDataset = {
+    calloutText?: string;
+    calloutEmoji?: string;
+    backgroundColor?: string;
+};
+
+type CalloutNodeProps = {
+    nodeType: 'callout';
+    properties: KoenigDecoratorNodeProperties
+};
+
+const calloutNodeProps: CalloutNodeProps = {
+    nodeType: 'callout',
     properties: [
         {name: 'calloutText', default: '', wordCount: true},
         {name: 'calloutEmoji', default: '💡'},
         {name: 'backgroundColor', default: 'blue'}
-    ]}
-) {
+    ]
+};
+
+export class CalloutNode extends generateDecoratorNode(calloutNodeProps) {
     /* override */
-    constructor({calloutText, calloutEmoji, backgroundColor} = {}, key) {
+    constructor({calloutText, calloutEmoji, backgroundColor}: CalloutNodeDataset = {}, key?: NodeKey) {
         super(key);
         this.__calloutText = calloutText || '';
         this.__calloutEmoji = calloutEmoji !== undefined ? calloutEmoji : '💡';
@@ -27,10 +42,10 @@ export class CalloutNode extends generateDecoratorNode({nodeType: 'callout',
     }
 }
 
-export function $isCalloutNode(node) {
-    return node instanceof CalloutNode;
-}
-
-export const $createCalloutNode = (dataset) => {
+export const $createCalloutNode = (dataset: CalloutNodeDataset) => {
     return new CalloutNode(dataset);
 };
+
+export function $isCalloutNode(node: LexicalNode) {
+    return node instanceof CalloutNode;
+}
\ No newline at end of file
diff --git a/packages/kg-default-nodes/lib/nodes/codeblock/CodeBlockNode.js b/packages/kg-default-nodes/lib/nodes/codeblock/CodeBlockNode.ts
similarity index 50%
rename from packages/kg-default-nodes/lib/nodes/codeblock/CodeBlockNode.js
rename to packages/kg-default-nodes/lib/nodes/codeblock/CodeBlockNode.ts
index 751d20531c..84a360ec8f 100644
--- a/packages/kg-default-nodes/lib/nodes/codeblock/CodeBlockNode.js
+++ b/packages/kg-default-nodes/lib/nodes/codeblock/CodeBlockNode.ts
@@ -1,15 +1,30 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseCodeBlockNode} from './codeblock-parser';
 import {renderCodeBlockNode} from './codeblock-renderer';
 
-export class CodeBlockNode extends generateDecoratorNode({nodeType: 'codeblock',
+export type CodeBlockNodeDataset = {
+    code?: string;
+    language?: string;
+    caption?: string;
+};
+
+type CodeBlockNodeProps = {
+    nodeType: 'codeblock';
+    properties: KoenigDecoratorNodeProperties
+};
+
+const codeBlockNodeProps: CodeBlockNodeProps = {
+    nodeType: 'codeblock',
     properties: [
         {name: 'code', default: '', wordCount: true},
         {name: 'language', default: ''},
         {name: 'caption', default: '', urlType: 'html', wordCount: true}
-    ]}
-) {
+    ]
+};
+
+export class CodeBlockNode extends generateDecoratorNode(codeBlockNodeProps) {
     static importDOM() {
         return parseCodeBlockNode(this);
     }
@@ -23,10 +38,10 @@ export class CodeBlockNode extends generateDecoratorNode({nodeType: 'codeblock',
     }
 }
 
-export function $createCodeBlockNode(dataset) {
+export function $createCodeBlockNode(dataset: CodeBlockNodeDataset) {
     return new CodeBlockNode(dataset);
 }
 
-export function $isCodeBlockNode(node) {
+export function $isCodeBlockNode(node: LexicalNode) {
     return node instanceof CodeBlockNode;
 }
diff --git a/packages/kg-default-nodes/lib/nodes/collection/CollectionNode.js b/packages/kg-default-nodes/lib/nodes/collection/CollectionNode.ts
similarity index 56%
rename from packages/kg-default-nodes/lib/nodes/collection/CollectionNode.js
rename to packages/kg-default-nodes/lib/nodes/collection/CollectionNode.ts
index c58d9a83ee..1f016ad081 100644
--- a/packages/kg-default-nodes/lib/nodes/collection/CollectionNode.js
+++ b/packages/kg-default-nodes/lib/nodes/collection/CollectionNode.ts
@@ -1,17 +1,34 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {renderCollectionNode} from './collection-renderer';
 import {collectionParser} from './collection-parser';
+import {LexicalNode} from 'lexical';
 
-export class CollectionNode extends generateDecoratorNode({nodeType: 'collection',
+export type CollectionNodeDataset = {
+    collection?: string;
+    postCount?: number;
+    layout?: string;
+    columns?: number;
+    header?: string;
+};
+
+type CollectionNodeProps = {
+    nodeType: 'collection';
+    properties: KoenigDecoratorNodeProperties
+};
+
+const collectionNodeProps: CollectionNodeProps = {
+    nodeType: 'collection',
     properties: [
         {name: 'collection', default: 'latest'}, // start with empty object; might want to just store the slug
         {name: 'postCount', default: 3},
         {name: 'layout', default: 'grid'},
         {name: 'columns', default: 3},
         {name: 'header', default: '', wordCount: true}
-    ]}
-) {
+    ]
+};
+
+export class CollectionNode extends generateDecoratorNode(collectionNodeProps) {
     static importDOM() {
         return collectionParser(this);
     }
@@ -24,7 +41,9 @@ export class CollectionNode extends generateDecoratorNode({nodeType: 'collection
         return true;
     }
 
-    async getDynamicData(options = {}) {
+    // TODO: build the options object
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async getDynamicData(options: any = {}) {
         const key = this.getKey();
         const collection = this.__collection;
         const postCount = this.__postCount;
@@ -38,10 +57,10 @@ export class CollectionNode extends generateDecoratorNode({nodeType: 'collection
     }
 }
 
-export const $createCollectionNode = (dataset) => {
+export const $createCollectionNode = (dataset: CollectionNodeDataset) => {
     return new CollectionNode(dataset);
 };
 
-export function $isCollectionNode(node) {
+export function $isCollectionNode(node: LexicalNode) {
     return node instanceof CollectionNode;
 }
diff --git a/packages/kg-default-nodes/lib/nodes/email-cta/EmailCtaNode.js b/packages/kg-default-nodes/lib/nodes/email-cta/EmailCtaNode.js
deleted file mode 100644
index 271d51d7c8..0000000000
--- a/packages/kg-default-nodes/lib/nodes/email-cta/EmailCtaNode.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
-import {renderEmailCtaNode} from './email-cta-renderer';
-
-export class EmailCtaNode extends generateDecoratorNode({nodeType: 'email-cta',
-    properties: [
-        {name: 'alignment', default: 'left'},
-        {name: 'buttonText', default: ''},
-        {name: 'buttonUrl', default: '', urlType: 'url'},
-        {name: 'html', default: '', urlType: 'html'},
-        {name: 'segment', default: 'status:free'},
-        {name: 'showButton', default: false},
-        {name: 'showDividers', default: true}
-    ]}
-) {
-    exportDOM(options = {}) {
-        return renderEmailCtaNode(this, options);
-    }
-}
-
-export const $createEmailCtaNode = (dataset) => {
-    return new EmailCtaNode(dataset);
-};
-
-export function $isEmailCtaNode(node) {
-    return node instanceof EmailCtaNode;
-}
diff --git a/packages/kg-default-nodes/lib/nodes/email-cta/EmailCtaNode.ts b/packages/kg-default-nodes/lib/nodes/email-cta/EmailCtaNode.ts
new file mode 100644
index 0000000000..0b644e96cd
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/email-cta/EmailCtaNode.ts
@@ -0,0 +1,47 @@
+/* eslint-disable ghost/filenames/match-exported-class */
+import {LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
+import {renderEmailCtaNode} from './email-cta-renderer';
+
+export type EmailCtaNodeDataset = {
+    alignment?: string;
+    buttonText?: string;
+    buttonUrl?: string;
+    html?: string;
+    segment?: string;
+    showButton?: boolean;
+    showDividers?: boolean;
+};
+
+type EmailCtaNodeProps = {
+    nodeType: 'email-cta';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const emailCtaNodeProps: EmailCtaNodeProps = {
+    nodeType: 'email-cta',
+    properties: [
+        {name: 'alignment', default: 'left'},
+        {name: 'buttonText', default: ''},
+        {name: 'buttonUrl', default: '', urlType: 'url'},
+        {name: 'html', default: '', urlType: 'html'},
+        {name: 'segment', default: 'status:free'},
+        {name: 'showButton', default: false},
+        {name: 'showDividers', default: true}
+    ]
+};
+
+export class EmailCtaNode extends generateDecoratorNode(emailCtaNodeProps) {
+    // TODO: build options
+    exportDOM(options = {}) {
+        return renderEmailCtaNode(this, options);
+    }
+}
+
+export const $createEmailCtaNode = (dataset: EmailCtaNodeDataset) => {
+    return new EmailCtaNode(dataset);
+};
+
+export function $isEmailCtaNode(node: LexicalNode) {
+    return node instanceof EmailCtaNode;
+}
diff --git a/packages/kg-default-nodes/lib/nodes/email/EmailNode.js b/packages/kg-default-nodes/lib/nodes/email/EmailNode.js
deleted file mode 100644
index 39bd5067ff..0000000000
--- a/packages/kg-default-nodes/lib/nodes/email/EmailNode.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
-import {renderEmailNode} from './email-renderer';
-
-export class EmailNode extends generateDecoratorNode({nodeType: 'email',
-    properties: [
-        {name: 'html', default: '', urlType: 'html'}
-    ]}
-) {
-    exportDOM(options = {}) {
-        return renderEmailNode(this, options);
-    }
-}
-
-export const $createEmailNode = (dataset) => {
-    return new EmailNode(dataset);
-};
-
-export function $isEmailNode(node) {
-    return node instanceof EmailNode;
-}
diff --git a/packages/kg-default-nodes/lib/nodes/email/EmailNode.ts b/packages/kg-default-nodes/lib/nodes/email/EmailNode.ts
new file mode 100644
index 0000000000..65a7636cad
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/email/EmailNode.ts
@@ -0,0 +1,34 @@
+/* eslint-disable ghost/filenames/match-exported-class */
+import {LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
+import {renderEmailNode} from './email-renderer';
+
+export type EmailNodeDataset = {
+    html?: string;
+};
+
+type EmailNodeProps = {
+    nodeType: 'email';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const emailNodeProps: EmailNodeProps = {
+    nodeType: 'email',
+    properties: [
+        {name: 'html', default: '', urlType: 'html'}
+    ]
+};
+
+export class EmailNode extends generateDecoratorNode(emailNodeProps) {
+    exportDOM(options = {}) {
+        return renderEmailNode(this, options);
+    }
+}
+
+export const $createEmailNode = (dataset: EmailNodeDataset) => {
+    return new EmailNode(dataset);
+};
+
+export function $isEmailNode(node: LexicalNode) {
+    return node instanceof EmailNode;
+}
diff --git a/packages/kg-default-nodes/lib/nodes/embed/EmbedNode.js b/packages/kg-default-nodes/lib/nodes/embed/EmbedNode.ts
similarity index 52%
rename from packages/kg-default-nodes/lib/nodes/embed/EmbedNode.js
rename to packages/kg-default-nodes/lib/nodes/embed/EmbedNode.ts
index d6d4e05fd0..39608b2f87 100644
--- a/packages/kg-default-nodes/lib/nodes/embed/EmbedNode.js
+++ b/packages/kg-default-nodes/lib/nodes/embed/EmbedNode.ts
@@ -1,17 +1,34 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseEmbedNode} from './embed-parser';
 import {renderEmbedNode} from './embed-renderer';
 
-export class EmbedNode extends generateDecoratorNode({nodeType: 'embed',
+export type EmbedNodeDataset = {
+    url?: string;
+    embedType?: string;
+    html?: string;
+    metadata?: object;
+    caption?: string;
+};
+
+type EmbedNodeProps = {
+    nodeType: 'embed';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const embedNodeProps: EmbedNodeProps = {
+    nodeType: 'embed',
     properties: [
         {name: 'url', default: '', urlType: 'url'},
         {name: 'embedType', default: ''},
         {name: 'html', default: ''},
         {name: 'metadata', default: {}},
         {name: 'caption', default: '', wordCount: true}
-    ]}
-) {
+    ]
+};
+
+export class EmbedNode extends generateDecoratorNode(embedNodeProps) {
     static importDOM() {
         return parseEmbedNode(this);
     }
@@ -25,10 +42,10 @@ export class EmbedNode extends generateDecoratorNode({nodeType: 'embed',
     }
 }
 
-export const $createEmbedNode = (dataset) => {
+export const $createEmbedNode = (dataset: EmbedNodeDataset) => {
     return new EmbedNode(dataset);
 };
 
-export function $isEmbedNode(node) {
+export function $isEmbedNode(node: LexicalNode) {
     return node instanceof EmbedNode;
 }
diff --git a/packages/kg-default-nodes/lib/nodes/file/FileNode.js b/packages/kg-default-nodes/lib/nodes/file/FileNode.ts
similarity index 58%
rename from packages/kg-default-nodes/lib/nodes/file/FileNode.js
rename to packages/kg-default-nodes/lib/nodes/file/FileNode.ts
index 00d37268cb..6a73d2350b 100644
--- a/packages/kg-default-nodes/lib/nodes/file/FileNode.js
+++ b/packages/kg-default-nodes/lib/nodes/file/FileNode.ts
@@ -1,25 +1,45 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {renderFileNode} from './file-renderer';
 import {parseFileNode} from './file-parser';
 import {bytesToSize} from '../../utils/size-byte-converter';
+import {LexicalNode, SerializedLexicalNode, Spread} from 'lexical';
 
-export class FileNode extends generateDecoratorNode({nodeType: 'file',
+export type FileNodeDataset = {
+    src?: string;
+    fileTitle?: string;
+    fileCaption?: string;
+    fileName?: string;
+    fileSize?: string;
+};
+
+type FileNodeProps = {
+    nodeType: 'file';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const fileNodeProps: FileNodeProps = {
+    nodeType: 'file',
     properties: [
         {name: 'src', default: '', urlType: 'url'},
         {name: 'fileTitle', default: '', wordCount: true},
         {name: 'fileCaption', default: '', wordCount: true},
         {name: 'fileName', default: ''},
         {name: 'fileSize', default: ''}
-    ]}
-) {
+    ]
+};
+
+export type SerializedFileNode = Spread<FileNodeDataset, SerializedLexicalNode>;
+
+export class FileNode extends generateDecoratorNode(fileNodeProps) {
     /* @override */
-    exportJSON() {
+    exportJSON(): SerializedFileNode {
         const {src, fileTitle, fileCaption, fileName, fileSize} = this;
         const isBlob = src.startsWith('data:');
 
         return {
             type: 'file',
+            version: 1,
             src: isBlob ? '<base64String>' : src,
             fileTitle,
             fileCaption,
@@ -41,10 +61,10 @@ export class FileNode extends generateDecoratorNode({nodeType: 'file',
     }
 }
 
-export function $isFileNode(node) {
-    return node instanceof FileNode;
-}
-
-export const $createFileNode = (dataset) => {
+export const $createFileNode = (dataset: FileNodeDataset) => {
     return new FileNode(dataset);
 };
+
+export function $isFileNode(node: LexicalNode) {
+    return node instanceof FileNode;
+}
diff --git a/packages/kg-default-nodes/lib/nodes/gallery/GalleryNode.js b/packages/kg-default-nodes/lib/nodes/gallery/GalleryNode.ts
similarity index 54%
rename from packages/kg-default-nodes/lib/nodes/gallery/GalleryNode.js
rename to packages/kg-default-nodes/lib/nodes/gallery/GalleryNode.ts
index b99c958e4b..d97f9f72fd 100644
--- a/packages/kg-default-nodes/lib/nodes/gallery/GalleryNode.js
+++ b/packages/kg-default-nodes/lib/nodes/gallery/GalleryNode.ts
@@ -1,13 +1,31 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseGalleryNode} from './gallery-parser';
 import {renderGalleryNode} from './gallery-renderer';
-export class GalleryNode extends generateDecoratorNode({nodeType: 'gallery',
+
+export type GalleryNodeDataset = {
+    images?: Array<{
+        src?: string;
+        caption?: string;
+    }>;
+    caption?: string;
+};
+
+type GalleryNodeProps = {
+    nodeType: 'gallery';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const galleryNodeProps: GalleryNodeProps = {
+    nodeType: 'gallery',
     properties: [
         {name: 'images', default: []},
         {name: 'caption', default: '', wordCount: true}
-    ]}
-) {
+    ]
+};
+
+export class GalleryNode extends generateDecoratorNode(galleryNodeProps) {
     /* override */
     static get urlTransformMap() {
         return {
@@ -32,10 +50,10 @@ export class GalleryNode extends generateDecoratorNode({nodeType: 'gallery',
     }
 }
 
-export const $createGalleryNode = (dataset) => {
+export const $createGalleryNode = (dataset: GalleryNodeDataset) => {
     return new GalleryNode(dataset);
 };
 
-export function $isGalleryNode(node) {
+export function $isGalleryNode(node: LexicalNode) {
     return node instanceof GalleryNode;
 }
diff --git a/packages/kg-default-nodes/lib/nodes/horizontalrule/HorizontalRuleNode.js b/packages/kg-default-nodes/lib/nodes/horizontalrule/HorizontalRuleNode.ts
similarity index 65%
rename from packages/kg-default-nodes/lib/nodes/horizontalrule/HorizontalRuleNode.js
rename to packages/kg-default-nodes/lib/nodes/horizontalrule/HorizontalRuleNode.ts
index e896f2bcd7..03b916b1bb 100644
--- a/packages/kg-default-nodes/lib/nodes/horizontalrule/HorizontalRuleNode.js
+++ b/packages/kg-default-nodes/lib/nodes/horizontalrule/HorizontalRuleNode.ts
@@ -2,8 +2,17 @@
 import {generateDecoratorNode} from '../../generate-decorator-node';
 import {renderHorizontalRuleNode} from './horizontalrule-renderer';
 import {parseHorizontalRuleNode} from './horizontalrule-parser';
+import {LexicalNode} from 'lexical';
 
-export class HorizontalRuleNode extends generateDecoratorNode({nodeType: 'horizontalrule'}) {
+type HorizontalRuleNodeProps = {
+    nodeType: 'horizontalrule';
+};
+
+const horizontalRuleNodeProps: HorizontalRuleNodeProps = {
+    nodeType: 'horizontalrule'
+};
+
+export class HorizontalRuleNode extends generateDecoratorNode(horizontalRuleNodeProps) {
     static importDOM() {
         return parseHorizontalRuleNode(this);
     }
@@ -25,6 +34,6 @@ export function $createHorizontalRuleNode() {
     return new HorizontalRuleNode();
 }
 
-export function $isHorizontalRuleNode(node) {
+export function $isHorizontalRuleNode(node: LexicalNode) {
     return node instanceof HorizontalRuleNode;
 }
diff --git a/packages/kg-default-nodes/lib/nodes/html/HtmlNode.js b/packages/kg-default-nodes/lib/nodes/html/HtmlNode.js
deleted file mode 100644
index 4d293cecfc..0000000000
--- a/packages/kg-default-nodes/lib/nodes/html/HtmlNode.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
-import {renderHtmlNode} from './html-renderer';
-import {parseHtmlNode} from './html-parser';
-
-export class HtmlNode extends generateDecoratorNode({nodeType: 'html',
-    properties: [
-        {name: 'html', default: '', urlType: 'html', wordCount: true}
-    ]}
-) {
-    static importDOM() {
-        return parseHtmlNode(this);
-    }
-
-    exportDOM(options = {}) {
-        return renderHtmlNode(this, options);
-    }
-
-    isEmpty() {
-        return !this.__html;
-    }
-}
-
-export function $createHtmlNode(dataset) {
-    return new HtmlNode(dataset);
-}
-
-export function $isHtmlNode(node) {
-    return node instanceof HtmlNode;
-}
diff --git a/packages/kg-default-nodes/lib/nodes/html/HtmlNode.ts b/packages/kg-default-nodes/lib/nodes/html/HtmlNode.ts
new file mode 100644
index 0000000000..41dcbf770b
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/html/HtmlNode.ts
@@ -0,0 +1,43 @@
+/* eslint-disable ghost/filenames/match-exported-class */
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
+import {renderHtmlNode} from './html-renderer';
+import {parseHtmlNode} from './html-parser';
+import {LexicalNode} from 'lexical';
+
+export type HtmlNodeDataset = {
+    html?: string;
+};
+
+type HtmlNodeProps = {
+    nodeType: 'html';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const htmlNodeProps: HtmlNodeProps = {
+    nodeType: 'html',
+    properties: [
+        {name: 'html', default: '', urlType: 'html', wordCount: true}
+    ]
+};
+
+export class HtmlNode extends generateDecoratorNode(htmlNodeProps) {
+    static importDOM() {
+        return parseHtmlNode(this);
+    }
+
+    exportDOM(options = {}) {
+        return renderHtmlNode(this, options);
+    }
+
+    isEmpty() {
+        return !this.__html;
+    }
+}
+
+export function $createHtmlNode(dataset: HtmlNodeDataset) {
+    return new HtmlNode(dataset);
+}
+
+export function $isHtmlNode(node: LexicalNode) {
+    return node instanceof HtmlNode;
+}
diff --git a/packages/kg-default-nodes/lib/nodes/image/ImageNode.js b/packages/kg-default-nodes/lib/nodes/image/ImageNode.ts
similarity index 66%
rename from packages/kg-default-nodes/lib/nodes/image/ImageNode.js
rename to packages/kg-default-nodes/lib/nodes/image/ImageNode.ts
index 4f9c609e03..dea91f5eea 100644
--- a/packages/kg-default-nodes/lib/nodes/image/ImageNode.js
+++ b/packages/kg-default-nodes/lib/nodes/image/ImageNode.ts
@@ -1,8 +1,27 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseImageNode} from './image-parser';
 import {renderImageNode} from './image-renderer';
-export class ImageNode extends generateDecoratorNode({nodeType: 'image',
+
+export type ImageNodeDataset = {
+    src?: string;
+    caption?: string;
+    title?: string;
+    alt?: string;
+    cardWidth?: string;
+    width?: number;
+    height?: number;
+    href?: string;
+};
+
+type ImageNodeProps = {
+    nodeType: 'image';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const imageNodeProps: ImageNodeProps = {
+    nodeType: 'image',
     properties: [
         {name: 'src', default: '', urlType: 'url'},
         {name: 'caption', default: '', urlType: 'html', wordCount: true},
@@ -12,8 +31,10 @@ export class ImageNode extends generateDecoratorNode({nodeType: 'image',
         {name: 'width', default: null},
         {name: 'height', default: null},
         {name: 'href', default: '', urlType: 'url'}
-    ]}
-) {
+    ]
+};
+
+export class ImageNode extends generateDecoratorNode(imageNodeProps) {
     /* @override */
     exportJSON() {
         // checks if src is a data string
@@ -48,10 +69,10 @@ export class ImageNode extends generateDecoratorNode({nodeType: 'image',
     }
 }
 
-export const $createImageNode = (dataset) => {
+export const $createImageNode = (dataset: ImageNodeDataset) => {
     return new ImageNode(dataset);
 };
 
-export function $isImageNode(node) {
+export function $isImageNode(node: LexicalNode) {
     return node instanceof ImageNode;
 }
diff --git a/packages/kg-default-nodes/lib/nodes/markdown/MarkdownNode.js b/packages/kg-default-nodes/lib/nodes/markdown/MarkdownNode.js
deleted file mode 100644
index a57d64b817..0000000000
--- a/packages/kg-default-nodes/lib/nodes/markdown/MarkdownNode.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
-import {renderMarkdownNode} from './markdown-renderer';
-
-export class MarkdownNode extends generateDecoratorNode({nodeType: 'markdown',
-    properties: [
-        {name: 'markdown', default: '', urlType: 'markdown', wordCount: true}
-    ]}
-) {
-    exportDOM(options = {}) {
-        return renderMarkdownNode(this, options);
-    }
-
-    isEmpty() {
-        return !this.__markdown;
-    }
-}
-
-export function $createMarkdownNode(dataset) {
-    return new MarkdownNode(dataset);
-}
-
-export function $isMarkdownNode(node) {
-    return node instanceof MarkdownNode;
-}
diff --git a/packages/kg-default-nodes/lib/nodes/markdown/MarkdownNode.ts b/packages/kg-default-nodes/lib/nodes/markdown/MarkdownNode.ts
new file mode 100644
index 0000000000..15f583ba8c
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/markdown/MarkdownNode.ts
@@ -0,0 +1,38 @@
+/* eslint-disable ghost/filenames/match-exported-class */
+import {LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
+import {renderMarkdownNode} from './markdown-renderer';
+
+export type MarkdownNodeDataset = {
+    markdown?: string;
+};
+
+type MarkdownNodeProps = {
+    nodeType: 'markdown';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const markdownNodeProps: MarkdownNodeProps = {
+    nodeType: 'markdown',
+    properties: [
+        {name: 'markdown', default: '', urlType: 'markdown', wordCount: true}
+    ]
+};
+
+export class MarkdownNode extends generateDecoratorNode(markdownNodeProps) {
+    exportDOM(options = {}) {
+        return renderMarkdownNode(this, options);
+    }
+
+    isEmpty() {
+        return !this.__markdown;
+    }
+}
+
+export function $createMarkdownNode(dataset: MarkdownNodeDataset) {
+    return new MarkdownNode(dataset);
+}
+
+export function $isMarkdownNode(node: LexicalNode) {
+    return node instanceof MarkdownNode;
+}
diff --git a/packages/kg-default-nodes/lib/nodes/paywall/PaywallNode.js b/packages/kg-default-nodes/lib/nodes/paywall/PaywallNode.ts
similarity index 50%
rename from packages/kg-default-nodes/lib/nodes/paywall/PaywallNode.js
rename to packages/kg-default-nodes/lib/nodes/paywall/PaywallNode.ts
index b825b6d735..769a332f52 100644
--- a/packages/kg-default-nodes/lib/nodes/paywall/PaywallNode.js
+++ b/packages/kg-default-nodes/lib/nodes/paywall/PaywallNode.ts
@@ -1,9 +1,20 @@
 /* eslint-disable ghost/filenames/match-exported-class */
+import {LexicalNode} from 'lexical';
 import {generateDecoratorNode} from '../../generate-decorator-node';
 import {parsePaywallNode} from './paywall-parser';
 import {renderPaywallNode} from './paywall-renderer';
 
-export class PaywallNode extends generateDecoratorNode({nodeType: 'paywall'}) {
+export type PaywallNodeDataset = object; // {} is the default value
+
+type PaywallNodeProps = {
+    nodeType: 'paywall';
+};
+
+const paywallNodeProps: PaywallNodeProps = {
+    nodeType: 'paywall'
+};
+
+export class PaywallNode extends generateDecoratorNode(paywallNodeProps) {
     static importDOM() {
         return parsePaywallNode(this);
     }
@@ -13,10 +24,10 @@ export class PaywallNode extends generateDecoratorNode({nodeType: 'paywall'}) {
     }
 }
 
-export const $createPaywallNode = (dataset) => {
-    return new PaywallNode(dataset);
+export const $createPaywallNode = () => {
+    return new PaywallNode();
 };
 
-export function $isPaywallNode(node) {
+export function $isPaywallNode(node: LexicalNode) {
     return node instanceof PaywallNode;
 }
diff --git a/packages/kg-default-nodes/lib/nodes/product/ProductNode.js b/packages/kg-default-nodes/lib/nodes/product/ProductNode.ts
similarity index 69%
rename from packages/kg-default-nodes/lib/nodes/product/ProductNode.js
rename to packages/kg-default-nodes/lib/nodes/product/ProductNode.ts
index a3b33c6222..c11c0811c7 100644
--- a/packages/kg-default-nodes/lib/nodes/product/ProductNode.js
+++ b/packages/kg-default-nodes/lib/nodes/product/ProductNode.ts
@@ -1,9 +1,29 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseProductNode} from './product-parser';
 import {renderProductNode} from './product-renderer';
 
-export class ProductNode extends generateDecoratorNode({nodeType: 'product',
+export type ProductNodeDataset = {
+    productImageSrc?: string;
+    productImageWidth?: number;
+    productImageHeight?: number;
+    productTitle?: string;
+    productDescription?: string;
+    productRatingEnabled?: boolean;
+    productStarRating?: number;
+    productButtonEnabled?: boolean;
+    productButton?: string;
+    productUrl?: string;
+};
+
+type ProductNodeProps = {
+    nodeType: 'product';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const productNodeProps: ProductNodeProps = {
+    nodeType: 'product',
     properties: [
         {name: 'productImageSrc', default: '', urlType: 'url'},
         {name: 'productImageWidth', default: null},
@@ -15,8 +35,10 @@ export class ProductNode extends generateDecoratorNode({nodeType: 'product',
         {name: 'productButtonEnabled', default: false},
         {name: 'productButton', default: ''},
         {name: 'productUrl', default: ''}
-    ]}
-) {
+    ]
+};
+
+export class ProductNode extends generateDecoratorNode(productNodeProps) {
     /* override */
     exportJSON() {
         // checks if src is a data string
@@ -49,16 +71,16 @@ export class ProductNode extends generateDecoratorNode({nodeType: 'product',
         return renderProductNode(this, options);
     }
 
-    isEmpty() {
+    isEmpty(): boolean {
         const isButtonFilled = this.__productButtonEnabled && this.__productUrl && this.__productButton;
         return !this.__productTitle && !this.__productDescription && !isButtonFilled && !this.__productImageSrc && !this.__productRatingEnabled;
     }
 }
 
-export const $createProductNode = (dataset) => {
+export const $createProductNode = (dataset: ProductNodeDataset) => {
     return new ProductNode(dataset);
 };
 
-export function $isProductNode(node) {
+export function $isProductNode(node: LexicalNode) {
     return node instanceof ProductNode;
 }
diff --git a/packages/kg-default-nodes/lib/nodes/signup/SignupNode.js b/packages/kg-default-nodes/lib/nodes/signup/SignupNode.ts
similarity index 72%
rename from packages/kg-default-nodes/lib/nodes/signup/SignupNode.js
rename to packages/kg-default-nodes/lib/nodes/signup/SignupNode.ts
index e1d802ca02..b7b054dccc 100644
--- a/packages/kg-default-nodes/lib/nodes/signup/SignupNode.js
+++ b/packages/kg-default-nodes/lib/nodes/signup/SignupNode.ts
@@ -1,9 +1,34 @@
 /* eslint-disable ghost/filenames/match-exported-class */
 import {signupParser} from './signup-parser';
 import {renderSignupCardToDOM} from './signup-renderer';
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
+import {LexicalNode, NodeKey} from 'lexical';
 
-export class SignupNode extends generateDecoratorNode({nodeType: 'signup',
+export type SignupNodeDataset = {
+    alignment?: string;
+    backgroundColor?: string;
+    backgroundImageSrc?: string;
+    backgroundSize?: string;
+    textColor?: string;
+    buttonColor?: string;
+    buttonTextColor?: string;
+    buttonText?: string;
+    disclaimer?: string;
+    header?: string;
+    labels?: string[];
+    layout?: string;
+    subheader?: string;
+    successMessage?: string;
+    swapped?: boolean;
+};
+
+type SignupNodeProps = {
+    nodeType: 'signup';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const signupNodeProps: SignupNodeProps = {
+    nodeType: 'signup',
     properties: [
         {name: 'alignment', default: 'left'},
         {name: 'backgroundColor', default: '#F0F0F0'},
@@ -20,9 +45,12 @@ export class SignupNode extends generateDecoratorNode({nodeType: 'signup',
         {name: 'subheader', default: '', wordCount: true},
         {name: 'successMessage', default: 'Email sent! Check your inbox to complete your signup.'},
         {name: 'swapped', default: false}
-    ]}) {
+    ]
+};
+
+export class SignupNode extends generateDecoratorNode(signupNodeProps) {
     /* override */
-    constructor({alignment, backgroundColor, backgroundImageSrc, backgroundSize, textColor, buttonColor, buttonTextColor, buttonText, disclaimer, header, labels, layout, subheader, successMessage, swapped} = {}, key) {
+    constructor({alignment, backgroundColor, backgroundImageSrc, backgroundSize, textColor, buttonColor, buttonTextColor, buttonText, disclaimer, header, labels, layout, subheader, successMessage, swapped}: SignupNodeDataset = {}, key?: NodeKey) {
         super(key);
         this.__alignment = alignment || 'left';
         this.__backgroundColor = backgroundColor || '#F0F0F0';
@@ -50,8 +78,7 @@ export class SignupNode extends generateDecoratorNode({nodeType: 'signup',
     }
 
     // keeping some custom methods for labels as it requires some special handling
-
-    setLabels(labels) {
+    setLabels(labels: string[]) {
         if (!Array.isArray(labels) || !labels.every(item => typeof item === 'string')) {
             throw new Error('Invalid argument: Expected an array of strings.'); // eslint-disable-line
         }
@@ -60,21 +87,21 @@ export class SignupNode extends generateDecoratorNode({nodeType: 'signup',
         writable.__labels = labels;
     }
 
-    addLabel(label) {
+    addLabel(label: string) {
         const writable = this.getWritable();
         writable.__labels.push(label);
     }
 
-    removeLabel(label) {
+    removeLabel(label: string) {
         const writable = this.getWritable();
-        writable.__labels = writable.__labels.filter(l => l !== label);
+        writable.__labels = writable.__labels.filter((l: string) => l !== label);
     }
 }
 
-export const $createSignupNode = (dataset) => {
+export const $createSignupNode = (dataset: SignupNodeDataset) => {
     return new SignupNode(dataset);
 };
 
-export function $isSignupNode(node) {
+export function $isSignupNode(node: LexicalNode) {
     return node instanceof SignupNode;
 }
diff --git a/packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.js b/packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.js
deleted file mode 100644
index 7894441076..0000000000
--- a/packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
-import {parseToggleNode} from './toggle-parser';
-import {renderToggleNode} from './toggle-renderer';
-
-export class ToggleNode extends generateDecoratorNode({nodeType: 'toggle',
-    properties: [
-        {name: 'heading', default: '', urlType: 'html', wordCount: true},
-        {name: 'content', default: '', urlType: 'html', wordCount: true}
-    ]}
-) {
-    static importDOM() {
-        return parseToggleNode(this);
-    }
-
-    exportDOM(options = {}) {
-        return renderToggleNode(this, options);
-    }
-}
-
-export const $createToggleNode = (dataset) => {
-    return new ToggleNode(dataset);
-};
-
-export function $isToggleNode(node) {
-    return node instanceof ToggleNode;
-}
diff --git a/packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.ts b/packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.ts
new file mode 100644
index 0000000000..7db36a0f64
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.ts
@@ -0,0 +1,41 @@
+/* eslint-disable ghost/filenames/match-exported-class */
+import {LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
+import {parseToggleNode} from './toggle-parser';
+import {renderToggleNode} from './toggle-renderer';
+
+export type ToggleNodeDataset = {
+    heading?: string;
+    content?: string;
+};
+
+type ToggleNodeProps = {
+    nodeType: 'toggle';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const toggleNodeProps: ToggleNodeProps = {
+    nodeType: 'toggle',
+    properties: [
+        {name: 'heading', default: '', urlType: 'html', wordCount: true},
+        {name: 'content', default: '', urlType: 'html', wordCount: true}
+    ]
+};
+
+export class ToggleNode extends generateDecoratorNode(toggleNodeProps) {
+    static importDOM() {
+        return parseToggleNode(this);
+    }
+
+    exportDOM(options = {}) {
+        return renderToggleNode(this, options);
+    }
+}
+
+export const $createToggleNode = (dataset: ToggleNodeDataset) => {
+    return new ToggleNode(dataset);
+};
+
+export function $isToggleNode(node: LexicalNode) {
+    return node instanceof ToggleNode;
+}
diff --git a/packages/kg-default-nodes/lib/nodes/video/VideoNode.js b/packages/kg-default-nodes/lib/nodes/video/VideoNode.ts
similarity index 71%
rename from packages/kg-default-nodes/lib/nodes/video/VideoNode.js
rename to packages/kg-default-nodes/lib/nodes/video/VideoNode.ts
index 1a23a4389e..0ba07c4fbd 100644
--- a/packages/kg-default-nodes/lib/nodes/video/VideoNode.js
+++ b/packages/kg-default-nodes/lib/nodes/video/VideoNode.ts
@@ -1,8 +1,32 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseVideoNode} from './video-parser';
 import {renderVideoNode} from './video-renderer';
-export class VideoNode extends generateDecoratorNode({nodeType: 'video',
+
+export type VideoNodeDataset = {
+    src?: string;
+    caption?: string;
+    fileName?: string;
+    mimeType?: string;
+    width?: number;
+    height?: number;
+    duration?: number;
+    thumbnailSrc?: string;
+    customThumbnailSrc?: string;
+    thumbnailWidth?: number;
+    thumbnailHeight?: number;
+    cardWidth?: string;
+    loop?: boolean;
+};
+
+type VideoNodeProps = {
+    nodeType: 'video';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const videoNodeProps: VideoNodeProps = {
+    nodeType: 'video',
     properties: [
         {name: 'src', default: '', urlType: 'url'},
         {name: 'caption', default: '', urlType: 'html', wordCount: true},
@@ -17,8 +41,10 @@ export class VideoNode extends generateDecoratorNode({nodeType: 'video',
         {name: 'thumbnailHeight', default: null},
         {name: 'cardWidth', default: 'regular'},
         {name: 'loop', default: false}
-    ]}
-) {
+    ]
+};
+
+export class VideoNode extends generateDecoratorNode(videoNodeProps) {
     /* override */
     exportJSON() {
         // checks if src is a data string
@@ -62,10 +88,10 @@ export class VideoNode extends generateDecoratorNode({nodeType: 'video',
     }
 }
 
-export const $createVideoNode = (dataset) => {
+export const $createVideoNode = (dataset: VideoNodeDataset) => {
     return new VideoNode(dataset);
 };
 
-export function $isVideoNode(node) {
+export function $isVideoNode(node: LexicalNode) {
     return node instanceof VideoNode;
 }
diff --git a/packages/kg-default-nodes/test/nodes/file.test.js b/packages/kg-default-nodes/test/nodes/file.test.js
index b9ebdbe310..513e61ccb3 100644
--- a/packages/kg-default-nodes/test/nodes/file.test.js
+++ b/packages/kg-default-nodes/test/nodes/file.test.js
@@ -208,6 +208,7 @@ describe('FileNode', function () {
             const json = fileNode.exportJSON();
             json.should.deepEqual({
                 type: 'file',
+                version: 1,
                 ...dataset
             });
         }));

From f106a39e4b44208f08578fba18c2917a0e9563ce Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Thu, 8 Feb 2024 17:03:31 -0600
Subject: [PATCH 21/33] some parsers

---
 .../lib/nodes/audio/audio-parser.ts           |  6 +-
 .../lib/nodes/bookmark/BookmarkNode.ts        |  6 +-
 ...{bookmark-parser.js => bookmark-parser.ts} | 64 ++++++++++--------
 .../lib/nodes/button/button-parser.ts         | 10 +--
 .../lib/nodes/callout/CalloutNode.ts          |  6 +-
 .../{callout-parser.js => callout-parser.ts}  | 19 +++---
 .../lib/nodes/codeblock/CodeBlockNode.ts      |  6 +-
 .../lib/nodes/codeblock/codeblock-parser.js   | 63 -----------------
 .../lib/nodes/codeblock/codeblock-parser.ts   | 67 +++++++++++++++++++
 .../lib/nodes/collection/CollectionNode.ts    |  6 +-
 ...lection-parser.js => collection-parser.ts} | 19 +++---
 .../lib/nodes/embed/EmbedNode.ts              |  6 +-
 .../{embed-parser.js => embed-parser.ts}      | 37 +++++-----
 .../lib/nodes/file/FileNode.ts                |  8 +--
 .../file/{file-parser.js => file-parser.ts}   | 16 +++--
 15 files changed, 178 insertions(+), 161 deletions(-)
 rename packages/kg-default-nodes/lib/nodes/bookmark/{bookmark-parser.js => bookmark-parser.ts} (62%)
 rename packages/kg-default-nodes/lib/nodes/callout/{callout-parser.js => callout-parser.ts} (63%)
 delete mode 100644 packages/kg-default-nodes/lib/nodes/codeblock/codeblock-parser.js
 create mode 100644 packages/kg-default-nodes/lib/nodes/codeblock/codeblock-parser.ts
 rename packages/kg-default-nodes/lib/nodes/collection/{collection-parser.js => collection-parser.ts} (71%)
 rename packages/kg-default-nodes/lib/nodes/embed/{embed-parser.js => embed-parser.ts} (67%)
 rename packages/kg-default-nodes/lib/nodes/file/{file-parser.js => file-parser.ts} (61%)

diff --git a/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts b/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
index 30aa304bfd..cac0608eab 100644
--- a/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
+++ b/packages/kg-default-nodes/lib/nodes/audio/audio-parser.ts
@@ -1,9 +1,5 @@
 import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
 import {$createAudioNode, AudioNodeDataset} from './AudioNode';
-import {KoenigDecoratorNode} from '../../KoenigDecoratorNode';
-
-// TODO: This is a workaround for the moment until we can get the generator fn output to be recognized as an extended KoenigDecoratorNode
-type AudioNode = KoenigDecoratorNode;
 
 export function parseAudioNode(): DOMConversionMap | null {
     return {
@@ -39,7 +35,7 @@ export function parseAudioNode(): DOMConversionMap | null {
                             }
                         }
 
-                        const node = $createAudioNode(payload) as AudioNode;
+                        const node = $createAudioNode(payload);
                         return {node};
                     },
                     priority: 1
diff --git a/packages/kg-default-nodes/lib/nodes/bookmark/BookmarkNode.ts b/packages/kg-default-nodes/lib/nodes/bookmark/BookmarkNode.ts
index 711bbd35b8..14db3d4377 100644
--- a/packages/kg-default-nodes/lib/nodes/bookmark/BookmarkNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/bookmark/BookmarkNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {LexicalNode, NodeKey, SerializedLexicalNode, Spread} from 'lexical';
+import {DOMConversionMap, LexicalNode, NodeKey, SerializedLexicalNode, Spread} from 'lexical';
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseBookmarkNode} from './bookmark-parser';
 import {renderBookmarkNode} from './bookmark-renderer';
@@ -39,8 +39,8 @@ const bookmarkNodeProps: BookmarkNodeProps = {
 };
 
 export class BookmarkNode extends generateDecoratorNode(bookmarkNodeProps) {
-    static importDOM() {
-        return parseBookmarkNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseBookmarkNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/bookmark/bookmark-parser.js b/packages/kg-default-nodes/lib/nodes/bookmark/bookmark-parser.ts
similarity index 62%
rename from packages/kg-default-nodes/lib/nodes/bookmark/bookmark-parser.js
rename to packages/kg-default-nodes/lib/nodes/bookmark/bookmark-parser.ts
index 8d6a7e7fd3..4ef0c934c5 100644
--- a/packages/kg-default-nodes/lib/nodes/bookmark/bookmark-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/bookmark/bookmark-parser.ts
@@ -1,31 +1,36 @@
-export function parseBookmarkNode(BookmarkNode) {
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {$createBookmarkNode, BookmarkNodeDataset} from './BookmarkNode';
+
+export function parseBookmarkNode(): DOMConversionMap | null {
     return {
-        figure: (nodeElem) => {
+        figure: (nodeElem: HTMLElement): DOMConversion | null => {
             const isKgBookmarkCard = nodeElem.classList?.contains('kg-bookmark-card');
             if (nodeElem.tagName === 'FIGURE' && isKgBookmarkCard) {
                 return {
-                    conversion(domNode) {
+                    conversion(domNode: HTMLElement): DOMConversionOutput {
                         const url = domNode?.querySelector('.kg-bookmark-container')?.getAttribute('href');
-                        const icon = domNode?.querySelector('.kg-bookmark-icon')?.src;
+                        const iconNode = domNode?.querySelector('.kg-bookmark-icon') as HTMLImageElement | null;
+                        const icon = iconNode?.src;
                         const title = domNode?.querySelector('.kg-bookmark-title')?.textContent;
                         const description = domNode?.querySelector('.kg-bookmark-description')?.textContent;
                         const author = domNode?.querySelector('.kg-bookmark-publisher')?.textContent; // NOTE: This is NOT in error. The classes are reversed for theme backwards-compatibility.
                         const publisher = domNode?.querySelector('.kg-bookmark-author')?.textContent; // NOTE: This is NOT in error. The classes are reversed for theme backwards-compatibility.
-                        const thumbnail = domNode?.querySelector('.kg-bookmark-thumbnail img')?.src;
+                        const thumbnailNode = domNode?.querySelector('.kg-bookmark-thumbnail img') as HTMLImageElement | null;
+                        const thumbnail = thumbnailNode?.src;
                         const caption = domNode?.querySelector('figure.kg-bookmark-card figcaption')?.textContent;
                         const payload = {
-                            url: url,
+                            url,
                             metadata: {
-                                icon: icon,
-                                title: title,
-                                description: description,
-                                author: author,
-                                publisher: publisher,
-                                thumbnail: thumbnail
+                                icon,
+                                title,
+                                description,
+                                author,
+                                publisher,
+                                thumbnail
                             },
-                            caption: caption
-                        };
-                        const node = new BookmarkNode(payload);
+                            caption
+                        } as BookmarkNodeDataset;
+                        const node = $createBookmarkNode(payload);
                         return {node};
                     },
                     priority: 1
@@ -33,24 +38,24 @@ export function parseBookmarkNode(BookmarkNode) {
             }
             return null;
         },
-        div: (nodeElem) => {
+        div: (nodeElem: HTMLElement): DOMConversion | null => {
             if (nodeElem.nodeType === 1 && nodeElem.tagName === 'DIV' && nodeElem.className.match(/graf--mixtapeEmbed/)) {
                 return {
-                    conversion(domNode) {
+                    conversion(domNode: HTMLElement): DOMConversionOutput {
                         // Grab the relevant elements - Anchor wraps most of the data
-                        const anchorElement = domNode.querySelector('.markup--mixtapeEmbed-anchor');
+                        const anchorElement = domNode.querySelector('.markup--mixtapeEmbed-anchor') as HTMLAnchorElement;
                         const titleElement = anchorElement.querySelector('.markup--mixtapeEmbed-strong');
                         const descElement = anchorElement.querySelector('.markup--mixtapeEmbed-em');
                         // Image is a top level field inside it's own a tag
-                        const imgElement = domNode.querySelector('.mixtapeImage');
+                        const imgElement = domNode.querySelector('.mixtapeImage') as HTMLAnchorElement;
 
-                        domNode.querySelector('br').remove();
+                        domNode.querySelector('br')?.remove();
 
                         // Grab individual values from the elements
                         const url = anchorElement.getAttribute('href');
-                        let title = '';
-                        let description = '';
-                        let thumbnail = '';
+                        let title;
+                        let description;
+                        let thumbnail;
 
                         if (titleElement && titleElement.innerHTML) {
                             title = titleElement.innerHTML.trim();
@@ -65,22 +70,23 @@ export function parseBookmarkNode(BookmarkNode) {
                         }
 
                         // Publisher is the remaining text in the anchor, once title & desc are removed
-                        let publisher = anchorElement.innerHTML.trim();
+                        const publisher = anchorElement.innerHTML.trim();
 
                         // Image is optional,
                         // The element usually still exists with an additional has.mixtapeImage--empty class and has no background image
-                        if (imgElement && imgElement.style['background-image']) {
-                            thumbnail = imgElement.style['background-image'].match(/url\(([^)]*?)\)/)[1];
+                        if (imgElement) {
+                            const imgElementStyle = imgElement.style.getPropertyValue('background-image');
+                            thumbnail = imgElementStyle?.match(/url\(([^)]*?)\)/)?.[1];
                         }
 
-                        let payload = {url,
+                        const payload = {url,
                             metadata: {
                                 title,
                                 description,
                                 publisher,
                                 thumbnail
-                            }};
-                        const node = new BookmarkNode(payload);
+                            }} as BookmarkNodeDataset;
+                        const node = $createBookmarkNode(payload);
                         return {node};
                     },
                     priority: 1
diff --git a/packages/kg-default-nodes/lib/nodes/button/button-parser.ts b/packages/kg-default-nodes/lib/nodes/button/button-parser.ts
index 861e28e521..5c18bdb792 100644
--- a/packages/kg-default-nodes/lib/nodes/button/button-parser.ts
+++ b/packages/kg-default-nodes/lib/nodes/button/button-parser.ts
@@ -1,5 +1,5 @@
 import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
-import {$createButtonNode} from './ButtonNode';
+import {$createButtonNode, ButtonNodeDataset} from './ButtonNode';
 
 export const parseButtonNode = (): DOMConversionMap | null => {
     return {
@@ -20,10 +20,10 @@ export const parseButtonNode = (): DOMConversionMap | null => {
                         const buttonText = buttonNode?.textContent;
 
                         const payload = {
-                            buttonText: buttonText,
-                            alignment: alignment,
-                            buttonUrl: buttonUrl
-                        };
+                            buttonText,
+                            alignment,
+                            buttonUrl
+                        } as ButtonNodeDataset;
 
                         const node = $createButtonNode(payload);
                         return {node};
diff --git a/packages/kg-default-nodes/lib/nodes/callout/CalloutNode.ts b/packages/kg-default-nodes/lib/nodes/callout/CalloutNode.ts
index 4468ec51ec..e8295c6dcf 100644
--- a/packages/kg-default-nodes/lib/nodes/callout/CalloutNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/callout/CalloutNode.ts
@@ -2,7 +2,7 @@
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {renderCalloutNode} from './callout-renderer';
 import {parseCalloutNode} from './callout-parser';
-import {LexicalNode, NodeKey} from 'lexical';
+import {DOMConversionMap, LexicalNode, NodeKey} from 'lexical';
 
 export type CalloutNodeDataset = {
     calloutText?: string;
@@ -33,8 +33,8 @@ export class CalloutNode extends generateDecoratorNode(calloutNodeProps) {
         this.__backgroundColor = backgroundColor || 'blue';
     }
 
-    static importDOM() {
-        return parseCalloutNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseCalloutNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/callout/callout-parser.js b/packages/kg-default-nodes/lib/nodes/callout/callout-parser.ts
similarity index 63%
rename from packages/kg-default-nodes/lib/nodes/callout/callout-parser.js
rename to packages/kg-default-nodes/lib/nodes/callout/callout-parser.ts
index b55e80d202..5d5a5c2dbd 100644
--- a/packages/kg-default-nodes/lib/nodes/callout/callout-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/callout/callout-parser.ts
@@ -1,26 +1,29 @@
-const getColorTag = (nodeElem) => {
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {$createCalloutNode, CalloutNodeDataset} from './CalloutNode';
+
+const getColorTag = (nodeElem: HTMLElement) => {
     const colorClass = nodeElem.classList?.value?.match(/kg-callout-card-(\w+)/);
     return colorClass && colorClass[1];
 };
 
-export function parseCalloutNode(CalloutNode) {
+export function parseCalloutNode(): DOMConversionMap | null {
     return {
-        div: (nodeElem) => {
+        div: (nodeElem: HTMLElement): DOMConversion | null => {
             const isKgCalloutCard = nodeElem.classList?.contains('kg-callout-card');
             if (nodeElem.tagName === 'DIV' && isKgCalloutCard) {
                 return {
-                    conversion(domNode) {
+                    conversion(domNode: HTMLElement): DOMConversionOutput {
                         const textNode = domNode?.querySelector('.kg-callout-text');
                         const emojiNode = domNode?.querySelector('.kg-callout-emoji');
                         const color = getColorTag(domNode);
 
                         const payload = {
-                            calloutText: textNode && textNode.innerHTML.trim() || '',
-                            calloutEmoji: emojiNode && emojiNode.innerHTML.trim() || '',
+                            calloutText: textNode && textNode.innerHTML.trim(),
+                            calloutEmoji: emojiNode && emojiNode.innerHTML.trim(),
                             backgroundColor: color
-                        };
+                        } as CalloutNodeDataset;
 
-                        const node = new CalloutNode(payload);
+                        const node = $createCalloutNode(payload);
                         return {node};
                     },
                     priority: 1
diff --git a/packages/kg-default-nodes/lib/nodes/codeblock/CodeBlockNode.ts b/packages/kg-default-nodes/lib/nodes/codeblock/CodeBlockNode.ts
index 84a360ec8f..a4b8aba633 100644
--- a/packages/kg-default-nodes/lib/nodes/codeblock/CodeBlockNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/codeblock/CodeBlockNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseCodeBlockNode} from './codeblock-parser';
 import {renderCodeBlockNode} from './codeblock-renderer';
@@ -25,8 +25,8 @@ const codeBlockNodeProps: CodeBlockNodeProps = {
 };
 
 export class CodeBlockNode extends generateDecoratorNode(codeBlockNodeProps) {
-    static importDOM() {
-        return parseCodeBlockNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseCodeBlockNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/codeblock/codeblock-parser.js b/packages/kg-default-nodes/lib/nodes/codeblock/codeblock-parser.js
deleted file mode 100644
index 8c22de773b..0000000000
--- a/packages/kg-default-nodes/lib/nodes/codeblock/codeblock-parser.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import {readCaptionFromElement} from '../../utils/read-caption-from-element';
-
-export function parseCodeBlockNode(CodeBlockNode) {
-    return {
-        figure: (nodeElem) => {
-            const pre = nodeElem.querySelector('pre');
-            if (nodeElem.tagName === 'FIGURE' && pre) {
-                return {
-                    conversion(domNode) {        
-                        let code = pre.querySelector('code');
-                        let figcaption = domNode.querySelector('figcaption');
-    
-                        // if there's no caption the pre key should pick it up
-                        if (!code || !figcaption) {
-                            return null;
-                        }
-    
-                        let payload = {
-                            code: code.textContent,
-                            caption: readCaptionFromElement(domNode)
-                        };
-    
-                        let preClass = pre.getAttribute('class') || '';
-                        let codeClass = code.getAttribute('class') || '';
-                        let langRegex = /lang(?:uage)?-(.*?)(?:\s|$)/i;
-                        let languageMatches = preClass.match(langRegex) || codeClass.match(langRegex);
-                        if (languageMatches) {
-                            payload.language = languageMatches[1].toLowerCase();
-                        }
-    
-                        const node = new CodeBlockNode(payload);
-                        return {node};
-                    },
-                    priority: 2 // falls back to pre if no caption
-                };
-            }
-            return null;
-        },
-        pre: () => ({
-            conversion(domNode) {
-                if (domNode.tagName === 'PRE') {
-                    let [codeElement] = domNode.children;
-
-                    if (codeElement && codeElement.tagName === 'CODE') {
-                        let payload = {code: codeElement.textContent};
-                        let preClass = domNode.getAttribute('class') || '';
-                        let codeClass = codeElement.getAttribute('class') || '';
-                        let langRegex = /lang(?:uage)?-(.*?)(?:\s|$)/i;
-                        let languageMatches = preClass.match(langRegex) || codeClass.match(langRegex);
-                        if (languageMatches) {
-                            payload.language = languageMatches[1].toLowerCase();
-                        }
-                        const node = new CodeBlockNode(payload);
-                        return {node};
-                    }
-                }
-
-                return null;
-            },
-            priority: 1
-        })
-    };
-}
diff --git a/packages/kg-default-nodes/lib/nodes/codeblock/codeblock-parser.ts b/packages/kg-default-nodes/lib/nodes/codeblock/codeblock-parser.ts
new file mode 100644
index 0000000000..bb9c3682e2
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/codeblock/codeblock-parser.ts
@@ -0,0 +1,67 @@
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {readCaptionFromElement} from '../../utils/read-caption-from-element';
+import {$createCodeBlockNode, CodeBlockNodeDataset} from './CodeBlockNode';
+
+export function parseCodeBlockNode(): DOMConversionMap | null {
+    return {
+        figure: (nodeElem: HTMLElement): DOMConversion | null => {
+            const pre = nodeElem.querySelector('pre');
+            if (nodeElem.tagName === 'FIGURE' && pre) {
+                return {
+                    conversion(domNode: HTMLElement): DOMConversionOutput | null {        
+                        const code = pre.querySelector('code');
+                        const figcaption = domNode.querySelector('figcaption');
+    
+                        // if there's no caption the pre key should pick it up
+                        if (!code || !figcaption) {
+                            return null;
+                        }
+    
+                        const payload = {
+                            code: code.textContent,
+                            caption: readCaptionFromElement(domNode)
+                        } as CodeBlockNodeDataset;
+    
+                        const preClass = pre.getAttribute('class') || '';
+                        const codeClass = code.getAttribute('class') || '';
+                        const langRegex = /lang(?:uage)?-(.*?)(?:\s|$)/i;
+                        const languageMatches = preClass.match(langRegex) || codeClass.match(langRegex);
+                        if (languageMatches) {
+                            payload.language = languageMatches[1].toLowerCase();
+                        }
+    
+                        const node = $createCodeBlockNode(payload);
+                        return {node};
+                    },
+                    priority: 2 // falls back to pre if no caption
+                };
+            }
+            return null;
+        },
+        pre: (): DOMConversion | null => ({
+            conversion(domNode: HTMLElement): DOMConversionOutput | null {
+                if (domNode.tagName === 'PRE') {
+                    const [codeElement] = domNode.children;
+
+                    if (codeElement && codeElement.tagName === 'CODE') {
+                        const payload = {
+                            code: codeElement.textContent
+                        } as CodeBlockNodeDataset;
+                        const preClass = domNode.getAttribute('class') || '';
+                        const codeClass = codeElement.getAttribute('class') || '';
+                        const langRegex = /lang(?:uage)?-(.*?)(?:\s|$)/i;
+                        const languageMatches = preClass.match(langRegex) || codeClass.match(langRegex);
+                        if (languageMatches) {
+                            payload.language = languageMatches[1].toLowerCase();
+                        }
+                        const node = $createCodeBlockNode(payload);
+                        return {node};
+                    }
+                }
+
+                return null;
+            },
+            priority: 1
+        })
+    };
+}
diff --git a/packages/kg-default-nodes/lib/nodes/collection/CollectionNode.ts b/packages/kg-default-nodes/lib/nodes/collection/CollectionNode.ts
index 1f016ad081..221f90c90f 100644
--- a/packages/kg-default-nodes/lib/nodes/collection/CollectionNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/collection/CollectionNode.ts
@@ -2,7 +2,7 @@
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {renderCollectionNode} from './collection-renderer';
 import {collectionParser} from './collection-parser';
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 
 export type CollectionNodeDataset = {
     collection?: string;
@@ -29,8 +29,8 @@ const collectionNodeProps: CollectionNodeProps = {
 };
 
 export class CollectionNode extends generateDecoratorNode(collectionNodeProps) {
-    static importDOM() {
-        return collectionParser(this);
+    static importDOM(): DOMConversionMap | null {
+        return collectionParser();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/collection/collection-parser.js b/packages/kg-default-nodes/lib/nodes/collection/collection-parser.ts
similarity index 71%
rename from packages/kg-default-nodes/lib/nodes/collection/collection-parser.js
rename to packages/kg-default-nodes/lib/nodes/collection/collection-parser.ts
index 156bebd840..059b4ac9b4 100644
--- a/packages/kg-default-nodes/lib/nodes/collection/collection-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/collection/collection-parser.ts
@@ -1,4 +1,7 @@
-function getLayout(domNode) {
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {$createCollectionNode, CollectionNodeDataset} from './CollectionNode';
+
+function getLayout(domNode: HTMLElement) {
     if (domNode.classList.contains('kg-collection-card-list')) {
         return 'list';
     } else { // should have kg-collection-card-grid
@@ -6,7 +9,7 @@ function getLayout(domNode) {
     }
 }
 
-function getColumns(domNode) {
+function getColumns(domNode: HTMLElement) {
     if (domNode.classList.contains('columns-1')) {
         return 1;
     }
@@ -21,14 +24,14 @@ function getColumns(domNode) {
     }
 }
 
-export function collectionParser(CollectionNode) {
+export function collectionParser(): DOMConversionMap | null {
     return {
-        div: (nodeElem) => {
+        div: (nodeElem: HTMLElement): DOMConversion | null => {
             const isCollectionNode = nodeElem.classList?.contains('kg-collection-card');
             if (nodeElem.tagName === 'DIV' && isCollectionNode) {
                 return {
-                    conversion(domNode) {
-                        const postCount = parseInt(domNode.getAttribute('data-kg-collection-limit'));
+                    conversion(domNode: HTMLElement): DOMConversionOutput {
+                        const postCount = parseInt(domNode.getAttribute('data-kg-collection-limit') || '');
                         const collection = domNode.getAttribute('data-kg-collection-slug');
                         const layout = getLayout(domNode);
                         const header = domNode.querySelector('.kg-collection-card-title')?.textContent || '';
@@ -40,9 +43,9 @@ export function collectionParser(CollectionNode) {
                             layout,
                             columns,
                             header
-                        };
+                        } as CollectionNodeDataset;
 
-                        const node = new CollectionNode(payload);
+                        const node = $createCollectionNode(payload);
                         return {node};
                     },
                     priority: 1
diff --git a/packages/kg-default-nodes/lib/nodes/embed/EmbedNode.ts b/packages/kg-default-nodes/lib/nodes/embed/EmbedNode.ts
index 39608b2f87..c99dad9ab7 100644
--- a/packages/kg-default-nodes/lib/nodes/embed/EmbedNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/embed/EmbedNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseEmbedNode} from './embed-parser';
 import {renderEmbedNode} from './embed-renderer';
@@ -29,8 +29,8 @@ const embedNodeProps: EmbedNodeProps = {
 };
 
 export class EmbedNode extends generateDecoratorNode(embedNodeProps) {
-    static importDOM() {
-        return parseEmbedNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseEmbedNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/embed/embed-parser.js b/packages/kg-default-nodes/lib/nodes/embed/embed-parser.ts
similarity index 67%
rename from packages/kg-default-nodes/lib/nodes/embed/embed-parser.js
rename to packages/kg-default-nodes/lib/nodes/embed/embed-parser.ts
index ecde2910ed..74c3e3d68e 100644
--- a/packages/kg-default-nodes/lib/nodes/embed/embed-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/embed/embed-parser.ts
@@ -1,15 +1,17 @@
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical/LexicalNode.js';
 import {readCaptionFromElement} from '../../utils/read-caption-from-element.js';
+import {$createEmbedNode, EmbedNodeDataset} from './EmbedNode.js';
 
 // TODO: add NFT card parser
-export function parseEmbedNode(EmbedNode) {
+export function parseEmbedNode(): DOMConversionMap | null {
     return {
-        figure: (nodeElem) => {
+        figure: (nodeElem: HTMLElement): DOMConversion | null => {
             if (nodeElem.nodeType === 1 && nodeElem.tagName === 'FIGURE') {
                 const iframe = nodeElem.querySelector('iframe');
                 if (iframe) {
                     return {
-                        conversion(domNode) {
-                            const payload = _createPayloadForIframe(iframe);
+                        conversion(domNode: HTMLElement): DOMConversionOutput | null {
+                            const payload = _createPayloadForIframe(iframe) as EmbedNodeDataset;
 
                             if (!payload) {
                                 return null;
@@ -17,7 +19,7 @@ export function parseEmbedNode(EmbedNode) {
 
                             payload.caption = readCaptionFromElement(domNode);
 
-                            const node = new EmbedNode(payload);
+                            const node = $createEmbedNode(payload);
                             return {node};
                         },
                         priority: 1
@@ -26,29 +28,29 @@ export function parseEmbedNode(EmbedNode) {
                 const blockquote = nodeElem.querySelector('blockquote');
                 if (blockquote) {
                     return {
-                        conversion(domNode) {
+                        conversion(domNode: HTMLElement): DOMConversionOutput | null {
                             const link = domNode.querySelector('a');
                             if (!link) {
                                 return null;
                             }
 
-                            let url = link.getAttribute('href');
+                            const url = link.getAttribute('href');
 
                             // If we don't have a url, or it's not an absolute URL, we can't handle this
                             if (!url || !url.match(/^https?:\/\//i)) {
                                 return null;
                             }
 
-                            let payload = {url: url};
+                            const payload = {url: url} as EmbedNodeDataset;
 
                             // append caption, remove element from blockquote
                             payload.caption = readCaptionFromElement(domNode);
-                            let figcaption = domNode.querySelector('figcaption');
+                            const figcaption = domNode.querySelector('figcaption');
                             figcaption?.remove();
 
                             payload.html = domNode.innerHTML;
 
-                            const node = new EmbedNode(payload);
+                            const node = $createEmbedNode(payload);
                             return {node};
                         },
                         priority: 1
@@ -57,17 +59,17 @@ export function parseEmbedNode(EmbedNode) {
             }
             return null;
         },
-        iframe: (nodeElem) => {
+        iframe: (nodeElem: HTMLElement): DOMConversion | null => {
             if (nodeElem.nodeType === 1 && nodeElem.tagName === 'IFRAME') {
                 return {
-                    conversion(domNode) {
-                        const payload = _createPayloadForIframe(domNode);
+                    conversion(domNode: HTMLElement): DOMConversionOutput | null {
+                        const payload = _createPayloadForIframe(domNode as HTMLIFrameElement);
 
                         if (!payload) {
                             return null;
                         }
 
-                        const node = new EmbedNode(payload);
+                        const node = $createEmbedNode(payload);
                         return {node};
                     },
                     priority: 1
@@ -78,7 +80,7 @@ export function parseEmbedNode(EmbedNode) {
     };
 }
 
-function _createPayloadForIframe(iframe) {
+function _createPayloadForIframe(iframe: HTMLIFrameElement): EmbedNodeDataset | undefined {
     // If we don't have a src Or it's not an absolute URL, we can't handle this
     // This regex handles http://, https:// or //
     if (!iframe.src || !iframe.src.match(/^(https?:)?\/\//i)) {
@@ -90,8 +92,9 @@ function _createPayloadForIframe(iframe) {
         iframe.src = `https:${iframe.src}`;
     }
 
-    let payload = {
-        url: iframe.src
+    const payload = {
+        url: iframe.src,
+        html: ''
     };
 
     payload.html = iframe.outerHTML;
diff --git a/packages/kg-default-nodes/lib/nodes/file/FileNode.ts b/packages/kg-default-nodes/lib/nodes/file/FileNode.ts
index 6a73d2350b..8e07dcf027 100644
--- a/packages/kg-default-nodes/lib/nodes/file/FileNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/file/FileNode.ts
@@ -3,14 +3,14 @@ import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../genera
 import {renderFileNode} from './file-renderer';
 import {parseFileNode} from './file-parser';
 import {bytesToSize} from '../../utils/size-byte-converter';
-import {LexicalNode, SerializedLexicalNode, Spread} from 'lexical';
+import {DOMConversionMap, LexicalNode, SerializedLexicalNode, Spread} from 'lexical';
 
 export type FileNodeDataset = {
     src?: string;
     fileTitle?: string;
     fileCaption?: string;
     fileName?: string;
-    fileSize?: string;
+    fileSize?: number;
 };
 
 type FileNodeProps = {
@@ -48,8 +48,8 @@ export class FileNode extends generateDecoratorNode(fileNodeProps) {
         };
     }
 
-    static importDOM() {
-        return parseFileNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseFileNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/file/file-parser.js b/packages/kg-default-nodes/lib/nodes/file/file-parser.ts
similarity index 61%
rename from packages/kg-default-nodes/lib/nodes/file/file-parser.js
rename to packages/kg-default-nodes/lib/nodes/file/file-parser.ts
index c3740879ff..ea93a6acbd 100644
--- a/packages/kg-default-nodes/lib/nodes/file/file-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/file/file-parser.ts
@@ -1,27 +1,29 @@
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
 import {sizeToBytes} from '../../utils/size-byte-converter';
+import {$createFileNode, FileNodeDataset} from './FileNode';
 
-export function parseFileNode(FileNode) {
+export function parseFileNode(): DOMConversionMap | null {
     return {
-        div: (nodeElem) => {
+        div: (nodeElem: HTMLElement): DOMConversion | null => {
             const isKgFileCard = nodeElem.classList?.contains('kg-file-card');
             if (nodeElem.tagName === 'DIV' && isKgFileCard) {
                 return {
-                    conversion(domNode) {
-                        const link = domNode.querySelector('a');
+                    conversion(domNode: HTMLElement): DOMConversionOutput {
+                        const link = domNode.querySelector('a') as HTMLAnchorElement;
                         const src = link.getAttribute('href');
                         const fileTitle = domNode.querySelector('.kg-file-card-title')?.textContent || '';
                         const fileCaption = domNode.querySelector('.kg-file-card-caption')?.textContent || '';
                         const fileName = domNode.querySelector('.kg-file-card-filename')?.textContent || '';
-                        let fileSize = sizeToBytes(domNode.querySelector('.kg-file-card-filesize')?.textContent || '');
+                        const fileSize = sizeToBytes(domNode.querySelector('.kg-file-card-filesize')?.textContent || '');
                         const payload = {
                             src,
                             fileTitle,
                             fileCaption,
                             fileName,
                             fileSize
-                        };
+                        } as FileNodeDataset;
 
-                        const node = new FileNode(payload);
+                        const node = $createFileNode(payload);
                         return {node};
                     },
                     priority: 1

From 841b7525fb7bb53cf108b6f125bb8dd4258ee84b Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Mon, 12 Feb 2024 13:50:34 -0600
Subject: [PATCH 22/33] update parsers to ts

---
 .../lib/nodes/aside/AsideNode.ts              |  4 +-
 .../lib/nodes/aside/aside-parser.ts           |  7 +-
 .../lib/nodes/gallery/GalleryNode.ts          |  6 +-
 .../{gallery-parser.js => gallery-parser.ts}  | 73 ++++++++++---------
 .../horizontalrule/HorizontalRuleNode.ts      |  6 +-
 .../horizontalrule/horizontalrule-parser.js   | 11 ---
 .../horizontalrule/horizontalrule-parser.ts   | 14 ++++
 .../lib/nodes/html/HtmlNode.ts                |  6 +-
 .../lib/nodes/html/html-parser.js             | 47 ------------
 .../lib/nodes/html/html-parser.ts             | 51 +++++++++++++
 .../lib/nodes/image/ImageNode.ts              |  6 +-
 .../{image-parser.js => image-parser.ts}      | 21 +++---
 .../lib/nodes/paywall/PaywallNode.ts          |  6 +-
 .../lib/nodes/paywall/paywall-parser.js       | 16 ----
 .../lib/nodes/paywall/paywall-parser.ts       | 19 +++++
 .../lib/nodes/product/ProductNode.ts          | 10 +--
 .../{product-parser.js => product-parser.ts}  | 27 +++----
 .../lib/nodes/signup/SignupNode.ts            |  6 +-
 .../{signup-parser.js => signup-parser.ts}    | 40 ++++++----
 .../lib/nodes/toggle/ToggleNode.ts            |  6 +-
 .../{toggle-parser.js => toggle-parser.ts}    | 17 +++--
 .../lib/nodes/video/VideoNode.ts              |  6 +-
 .../{video-parser.js => video-parser.ts}      | 19 +++--
 .../read-image-attributes-from-element.js     | 43 -----------
 .../read-image-attributes-from-element.ts     | 58 +++++++++++++++
 25 files changed, 290 insertions(+), 235 deletions(-)
 rename packages/kg-default-nodes/lib/nodes/gallery/{gallery-parser.js => gallery-parser.ts} (58%)
 delete mode 100644 packages/kg-default-nodes/lib/nodes/horizontalrule/horizontalrule-parser.js
 create mode 100644 packages/kg-default-nodes/lib/nodes/horizontalrule/horizontalrule-parser.ts
 delete mode 100644 packages/kg-default-nodes/lib/nodes/html/html-parser.js
 create mode 100644 packages/kg-default-nodes/lib/nodes/html/html-parser.ts
 rename packages/kg-default-nodes/lib/nodes/image/{image-parser.js => image-parser.ts} (63%)
 delete mode 100644 packages/kg-default-nodes/lib/nodes/paywall/paywall-parser.js
 create mode 100644 packages/kg-default-nodes/lib/nodes/paywall/paywall-parser.ts
 rename packages/kg-default-nodes/lib/nodes/product/{product-parser.js => product-parser.ts} (69%)
 rename packages/kg-default-nodes/lib/nodes/signup/{signup-parser.js => signup-parser.ts} (64%)
 rename packages/kg-default-nodes/lib/nodes/toggle/{toggle-parser.js => toggle-parser.ts} (50%)
 rename packages/kg-default-nodes/lib/nodes/video/{video-parser.js => video-parser.ts} (79%)
 delete mode 100644 packages/kg-default-nodes/lib/utils/read-image-attributes-from-element.js
 create mode 100644 packages/kg-default-nodes/lib/utils/read-image-attributes-from-element.ts

diff --git a/packages/kg-default-nodes/lib/nodes/aside/AsideNode.ts b/packages/kg-default-nodes/lib/nodes/aside/AsideNode.ts
index c5cca7b964..f001e0b6d9 100644
--- a/packages/kg-default-nodes/lib/nodes/aside/AsideNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/aside/AsideNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {ElementFormatType, ElementNode, LexicalNode, NodeKey, SerializedLexicalNode, Spread} from 'lexical';
+import {DOMConversionMap, ElementFormatType, ElementNode, LexicalNode, NodeKey, SerializedLexicalNode, Spread} from 'lexical';
 import {parseAsideNode} from './aside-parser';
 
 export type SerializedAsideNode = Spread<{
@@ -44,7 +44,7 @@ export class AsideNode extends ElementNode {
         return dataset;
     }
 
-    static importDOM() {
+    static importDOM(): DOMConversionMap | null {
         return parseAsideNode();
     }
 
diff --git a/packages/kg-default-nodes/lib/nodes/aside/aside-parser.ts b/packages/kg-default-nodes/lib/nodes/aside/aside-parser.ts
index b558cd7c3c..ef204fd9e2 100644
--- a/packages/kg-default-nodes/lib/nodes/aside/aside-parser.ts
+++ b/packages/kg-default-nodes/lib/nodes/aside/aside-parser.ts
@@ -1,12 +1,13 @@
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
 import {$createAsideNode} from './AsideNode';
 
-export function parseAsideNode() {
+export function parseAsideNode(): DOMConversionMap | null {
     return {
-        blockquote: (nodeElem: HTMLElement) => {
+        blockquote: (nodeElem: HTMLElement): DOMConversion | null => {
             const isBigQuote = nodeElem.classList?.contains('kg-blockquote-alt');
             if (nodeElem.tagName === 'BLOCKQUOTE' && isBigQuote) {
                 return {
-                    conversion() {
+                    conversion(): DOMConversionOutput {
                         const node = $createAsideNode();
                         return {node};
                     },
diff --git a/packages/kg-default-nodes/lib/nodes/gallery/GalleryNode.ts b/packages/kg-default-nodes/lib/nodes/gallery/GalleryNode.ts
index d97f9f72fd..68338384bb 100644
--- a/packages/kg-default-nodes/lib/nodes/gallery/GalleryNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/gallery/GalleryNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseGalleryNode} from './gallery-parser';
 import {renderGalleryNode} from './gallery-renderer';
@@ -37,8 +37,8 @@ export class GalleryNode extends generateDecoratorNode(galleryNodeProps) {
         };
     }
 
-    static importDOM() {
-        return parseGalleryNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseGalleryNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/gallery/gallery-parser.js b/packages/kg-default-nodes/lib/nodes/gallery/gallery-parser.ts
similarity index 58%
rename from packages/kg-default-nodes/lib/nodes/gallery/gallery-parser.js
rename to packages/kg-default-nodes/lib/nodes/gallery/gallery-parser.ts
index 0b0b555e66..dbf37b6bb7 100644
--- a/packages/kg-default-nodes/lib/nodes/gallery/gallery-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/gallery/gallery-parser.ts
@@ -1,29 +1,31 @@
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical/LexicalNode.js';
 import {readCaptionFromElement} from '../../utils/read-caption-from-element.js';
 import {readImageAttributesFromElement} from '../../utils/read-image-attributes-from-element.js';
+import {$createGalleryNode, GalleryNodeDataset} from './GalleryNode.js';
 
-function readGalleryImageAttributesFromElement(element, imgNum) {
+function readGalleryImageAttributesFromElement(element: HTMLImageElement, imgNum: number) {
     const image = readImageAttributesFromElement(element);
 
-    image.fileName = element.src.match(/[^/]*$/)[0];
+    image.fileName = element.src?.match(/[^/]*$/)?.[0];
     image.row = Math.floor(imgNum / 3);
 
     return image;
 }
 
-export function parseGalleryNode(GalleryNode) {
+export function parseGalleryNode(): DOMConversionMap | null {
     return {
-        figure: (nodeElem) => {
+        figure: (nodeElem: HTMLElement): DOMConversion | null => {
             // Koenig gallery card
             if (nodeElem.classList?.contains('kg-gallery-card')) {
                 return {
-                    conversion(domNode) {
-                        const payload = {};
+                    conversion(domNode): DOMConversionOutput {
+                        const payload: GalleryNodeDataset = {};
                         const imgs = Array.from(domNode.querySelectorAll('img'));
 
                         payload.images = imgs.map(readGalleryImageAttributesFromElement);
                         payload.caption = readCaptionFromElement(domNode);
 
-                        const node = new GalleryNode(payload);
+                        const node = $createGalleryNode(payload);
                         return {node};
                     },
                     priority: 1
@@ -32,18 +34,19 @@ export function parseGalleryNode(GalleryNode) {
 
             return null;
         },
-        div: (nodeElem) => {
+        div: (nodeElem: HTMLElement): DOMConversion | null => {
             // Medium "graf" galleries
-            function isGrafGallery(node) {
-                return node.tagName === 'DIV'
-                        && node.dataset?.paragraphCount
-                        && node.querySelectorAll('img').length > 0;
+            function isGrafGallery(node: HTMLElement): boolean {
+                if (node.tagName === 'DIV' && node.dataset?.paragraphCount && node.querySelectorAll('img').length > 0) {
+                    return true;
+                }
+                return false;
             }
 
             if (isGrafGallery(nodeElem)) {
                 return {
-                    conversion(domNode) {
-                        const payload = {
+                    conversion(domNode): DOMConversionOutput {
+                        const payload: GalleryNodeDataset = {
                             caption: readCaptionFromElement(domNode)
                         };
 
@@ -52,9 +55,9 @@ export function parseGalleryNode(GalleryNode) {
                         let imgs = Array.from(domNode.querySelectorAll('img'));
 
                         // ...and then iterate over any remaining divs until we run out of matches
-                        let nextNode = domNode.nextElementSibling;
+                        let nextNode = domNode.nextElementSibling as HTMLElement;
                         while (nextNode && isGrafGallery(nextNode)) {
-                            let currentNode = nextNode;
+                            const currentNode = nextNode;
                             imgs = imgs.concat(Array.from(currentNode.querySelectorAll('img')));
 
                             const currentNodeCaption = readCaptionFromElement(currentNode);
@@ -62,7 +65,7 @@ export function parseGalleryNode(GalleryNode) {
                                 payload.caption = `${payload.caption} / ${currentNodeCaption}`;
                             }
 
-                            nextNode = currentNode.nextElementSibling;
+                            nextNode = currentNode.nextElementSibling as HTMLElement;
 
                             // remove nodes as we go so that they don't go through the parser
                             currentNode.remove();
@@ -70,7 +73,7 @@ export function parseGalleryNode(GalleryNode) {
 
                         payload.images = imgs.map(readGalleryImageAttributesFromElement);
 
-                        const node = new GalleryNode(payload);
+                        const node = $createGalleryNode(payload);
                         return {node};
                     },
                     priority: 1
@@ -78,42 +81,46 @@ export function parseGalleryNode(GalleryNode) {
             }
 
             // Squarespace SQS galleries
-            function isSqsGallery(node) {
-                return node.tagName === 'DIV'
-                        && node.className.match(/sqs-gallery-container/)
-                        && !node.className.match(/summary-/);
+            function isSqsGallery(node: HTMLElement): boolean {
+                if (node.tagName === 'DIV' && node.className.match(/sqs-gallery-container/) && !node.className.match(/summary-/)) {
+                    return true;
+                }
+                return false;
             }
 
             if (isSqsGallery(nodeElem)) {
                 return {
-                    conversion(domNode) {
-                        const payload = {};
+                    conversion(domNode): DOMConversionOutput {
+                        const payload: GalleryNodeDataset = {};
 
                         // Each image exists twice...
                         // The first image is wrapped in `<noscript>`
                         // The second image contains image dimensions but the src property needs to be taken from `data-src`.
-                        let imgs = Array.from(domNode.querySelectorAll('img.thumb-image'));
+                        let imgs: HTMLImageElement[] = Array.from(domNode.querySelectorAll('img.thumb-image'));
 
-                        imgs = imgs.map((img) => {
+                        imgs = imgs.filter((img) => {
                             if (!img.getAttribute('src')) {
-                                if (img.previousElementSibling.tagName === 'NOSCRIPT' && img.previousElementSibling.getElementsByTagName('img').length) {
+                                if (img.previousElementSibling?.tagName === 'NOSCRIPT' && img.previousElementSibling.getElementsByTagName('img').length) {
                                     const prevNode = img.previousElementSibling;
-                                    img.setAttribute('src', img.getAttribute('data-src'));
+                                    const src = img.getAttribute('data-src');
+                                    if (src) {
+                                        img.setAttribute('src', src);
+                                    }
                                     prevNode.remove();
+                                    return true;
                                 } else {
-                                    return undefined;
+                                    return false;
                                 }
                             }
-
-                            return img;
-                        }).filter(img => img !== undefined);
+                            return true;
+                        });
 
                         // Process nodes into the payload
                         payload.images = imgs.map(readGalleryImageAttributesFromElement);
 
                         payload.caption = readCaptionFromElement(domNode, {selector: '.meta-title'});
 
-                        const node = new GalleryNode(payload);
+                        const node = $createGalleryNode(payload);
                         return {node};
                     },
                     priority: 1
diff --git a/packages/kg-default-nodes/lib/nodes/horizontalrule/HorizontalRuleNode.ts b/packages/kg-default-nodes/lib/nodes/horizontalrule/HorizontalRuleNode.ts
index 03b916b1bb..c0ec01248e 100644
--- a/packages/kg-default-nodes/lib/nodes/horizontalrule/HorizontalRuleNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/horizontalrule/HorizontalRuleNode.ts
@@ -2,7 +2,7 @@
 import {generateDecoratorNode} from '../../generate-decorator-node';
 import {renderHorizontalRuleNode} from './horizontalrule-renderer';
 import {parseHorizontalRuleNode} from './horizontalrule-parser';
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 
 type HorizontalRuleNodeProps = {
     nodeType: 'horizontalrule';
@@ -13,8 +13,8 @@ const horizontalRuleNodeProps: HorizontalRuleNodeProps = {
 };
 
 export class HorizontalRuleNode extends generateDecoratorNode(horizontalRuleNodeProps) {
-    static importDOM() {
-        return parseHorizontalRuleNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseHorizontalRuleNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/horizontalrule/horizontalrule-parser.js b/packages/kg-default-nodes/lib/nodes/horizontalrule/horizontalrule-parser.js
deleted file mode 100644
index f5151bca69..0000000000
--- a/packages/kg-default-nodes/lib/nodes/horizontalrule/horizontalrule-parser.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export function parseHorizontalRuleNode(HorizontalRuleNode) {
-    return {
-        hr: () => ({
-            conversion() {
-                const node = new HorizontalRuleNode();
-                return {node};
-            },
-            priority: 0
-        })
-    };
-}
diff --git a/packages/kg-default-nodes/lib/nodes/horizontalrule/horizontalrule-parser.ts b/packages/kg-default-nodes/lib/nodes/horizontalrule/horizontalrule-parser.ts
new file mode 100644
index 0000000000..7bc5820c2c
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/horizontalrule/horizontalrule-parser.ts
@@ -0,0 +1,14 @@
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {$createHorizontalRuleNode} from './HorizontalRuleNode';
+
+export function parseHorizontalRuleNode(): DOMConversionMap | null {
+    return {
+        hr: (): DOMConversion => ({
+            conversion(): DOMConversionOutput {
+                const node = $createHorizontalRuleNode();
+                return {node};
+            },
+            priority: 0
+        })
+    };
+}
diff --git a/packages/kg-default-nodes/lib/nodes/html/HtmlNode.ts b/packages/kg-default-nodes/lib/nodes/html/HtmlNode.ts
index 41dcbf770b..72f01dda10 100644
--- a/packages/kg-default-nodes/lib/nodes/html/HtmlNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/html/HtmlNode.ts
@@ -2,7 +2,7 @@
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {renderHtmlNode} from './html-renderer';
 import {parseHtmlNode} from './html-parser';
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 
 export type HtmlNodeDataset = {
     html?: string;
@@ -21,8 +21,8 @@ const htmlNodeProps: HtmlNodeProps = {
 };
 
 export class HtmlNode extends generateDecoratorNode(htmlNodeProps) {
-    static importDOM() {
-        return parseHtmlNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseHtmlNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/html/html-parser.js b/packages/kg-default-nodes/lib/nodes/html/html-parser.js
deleted file mode 100644
index 03895400f7..0000000000
--- a/packages/kg-default-nodes/lib/nodes/html/html-parser.js
+++ /dev/null
@@ -1,47 +0,0 @@
-export function parseHtmlNode(HtmlNode) {
-    return {
-        '#comment': (nodeElem) => {
-            if (nodeElem.nodeType === 8 && nodeElem.nodeValue.trim().match(/^kg-card-begin:\s?html$/)) {
-                return {
-                    conversion(domNode) {
-                        let html = [];
-                        let nextNode = domNode.nextSibling;
-
-                        while (nextNode && !isHtmlEndComment(nextNode)) {
-                            let currentNode = nextNode;
-                            html.push(currentNode.outerHTML);
-                            nextNode = currentNode.nextSibling;
-                            // remove nodes as we go so that they don't go through the parser
-                            currentNode.remove();
-                        }
-
-                        let payload = {html: html.join('\n').trim()};
-                        const node = new HtmlNode(payload);
-                        return {node};
-                    },
-                    priority: 0
-                };
-            }
-
-            return null;
-        },
-        table: (nodeElem) => {
-            if (nodeElem.nodeType === 1 && nodeElem.tagName === 'TABLE' && nodeElem.parentNode.tagName !== 'TABLE') {
-                return {
-                    conversion(domNode) {
-                        const payload = {html: domNode.outerHTML};
-                        const node = new HtmlNode(payload);
-                        return {node};
-                    },
-                    priority: 0
-                };
-            }
-
-            return null;
-        }
-    };
-}
-
-function isHtmlEndComment(node) {
-    return node && node.nodeType === 8 && node.nodeValue.trim().match(/^kg-card-end:\s?html$/);
-}
diff --git a/packages/kg-default-nodes/lib/nodes/html/html-parser.ts b/packages/kg-default-nodes/lib/nodes/html/html-parser.ts
new file mode 100644
index 0000000000..ce318ead62
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/html/html-parser.ts
@@ -0,0 +1,51 @@
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {$createHtmlNode, HtmlNodeDataset} from './HtmlNode';
+
+export function parseHtmlNode(): DOMConversionMap | null {
+    return {
+        '#comment': (nodeElem: HTMLElement): DOMConversion | null => {
+            if (nodeElem.nodeType === 8 && nodeElem.nodeValue?.trim().match(/^kg-card-begin:\s?html$/)) {
+                return {
+                    conversion(domNode: HTMLElement): DOMConversionOutput {
+                        const html = [];
+                        let nextNode = domNode.nextSibling as HTMLElement;
+
+                        while (nextNode && !isHtmlEndComment(nextNode)) {
+                            const currentNode = nextNode as HTMLElement;
+                            html.push(currentNode.outerHTML);
+                            nextNode = currentNode.nextSibling as HTMLElement;
+                            // remove nodes as we go so that they don't go through the parser
+                            currentNode.remove();
+                        }
+
+                        const payload: HtmlNodeDataset = {html: html.join('\n').trim()};
+                        const node = $createHtmlNode(payload);
+                        return {node};
+                    },
+                    priority: 0
+                };
+            }
+
+            return null;
+        },
+        table: (nodeElem: HTMLElement): DOMConversion | null => {
+            const parentNode = nodeElem.parentNode as HTMLElement;
+            if (nodeElem.nodeType === 1 && nodeElem.tagName === 'TABLE' && parentNode?.tagName !== 'TABLE') {
+                return {
+                    conversion(domNode: HTMLElement): DOMConversionOutput {
+                        const payload: HtmlNodeDataset = {html: domNode.outerHTML};
+                        const node = $createHtmlNode(payload);
+                        return {node};
+                    },
+                    priority: 0
+                };
+            }
+
+            return null;
+        }
+    };
+}
+
+function isHtmlEndComment(node: HTMLElement) {
+    return node && node.nodeType === 8 && node.nodeValue?.trim().match(/^kg-card-end:\s?html$/);
+}
diff --git a/packages/kg-default-nodes/lib/nodes/image/ImageNode.ts b/packages/kg-default-nodes/lib/nodes/image/ImageNode.ts
index dea91f5eea..4088b24294 100644
--- a/packages/kg-default-nodes/lib/nodes/image/ImageNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/image/ImageNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseImageNode} from './image-parser';
 import {renderImageNode} from './image-renderer';
@@ -56,8 +56,8 @@ export class ImageNode extends generateDecoratorNode(imageNodeProps) {
         return dataset;
     }
 
-    static importDOM() {
-        return parseImageNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseImageNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/image/image-parser.js b/packages/kg-default-nodes/lib/nodes/image/image-parser.ts
similarity index 63%
rename from packages/kg-default-nodes/lib/nodes/image/image-parser.js
rename to packages/kg-default-nodes/lib/nodes/image/image-parser.ts
index c13d66a4a4..e15653bea6 100644
--- a/packages/kg-default-nodes/lib/nodes/image/image-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/image/image-parser.ts
@@ -1,14 +1,16 @@
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical/LexicalNode.js';
 import {readCaptionFromElement} from '../../utils/read-caption-from-element.js';
 import {readImageAttributesFromElement} from '../../utils/read-image-attributes-from-element.js';
+import {$createImageNode, ImageNodeDataset} from './ImageNode.js';
 
-export function parseImageNode(ImageNode) {
+export function parseImageNode(): DOMConversionMap | null {
     return {
-        img: () => ({
-            conversion(domNode) {
+        img: (): DOMConversion => ({
+            conversion(domNode: HTMLElement): DOMConversionOutput | null {
                 if (domNode.tagName === 'IMG') {
-                    const {src, width, height, alt, title, href} = readImageAttributesFromElement(domNode);
+                    const payload: ImageNodeDataset = readImageAttributesFromElement(domNode as HTMLImageElement);
 
-                    const node = new ImageNode({alt, src, title, width, height, href});
+                    const node = $createImageNode(payload);
                     return {node};
                 }
 
@@ -16,11 +18,11 @@ export function parseImageNode(ImageNode) {
             },
             priority: 1
         }),
-        figure: (nodeElem) => {
+        figure: (nodeElem: HTMLElement): DOMConversion | null => {
             const img = nodeElem.querySelector('img');
             if (img) {
                 return {
-                    conversion(domNode) {
+                    conversion(domNode: HTMLElement): DOMConversionOutput | null {
                         const kgClass = domNode.className.match(/kg-width-(wide|full)/);
                         const grafClass = domNode.className.match(/graf--layout(FillWidth|OutsetCenter)/);
 
@@ -28,7 +30,7 @@ export function parseImageNode(ImageNode) {
                             return null;
                         }
 
-                        const payload = readImageAttributesFromElement(img);
+                        const payload: ImageNodeDataset = readImageAttributesFromElement(img);
 
                         if (kgClass) {
                             payload.cardWidth = kgClass[1];
@@ -38,8 +40,7 @@ export function parseImageNode(ImageNode) {
 
                         payload.caption = readCaptionFromElement(domNode);
 
-                        const {src, width, height, alt, title, caption, cardWidth, href} = payload;
-                        const node = new ImageNode({alt, src, title, width, height, caption, cardWidth, href});
+                        const node = $createImageNode(payload);
                         return {node};
                     },
                     priority: 0 // since we are generically parsing figure elements, we want this to run after others (like the gallery)
diff --git a/packages/kg-default-nodes/lib/nodes/paywall/PaywallNode.ts b/packages/kg-default-nodes/lib/nodes/paywall/PaywallNode.ts
index 769a332f52..052b466400 100644
--- a/packages/kg-default-nodes/lib/nodes/paywall/PaywallNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/paywall/PaywallNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 import {generateDecoratorNode} from '../../generate-decorator-node';
 import {parsePaywallNode} from './paywall-parser';
 import {renderPaywallNode} from './paywall-renderer';
@@ -15,8 +15,8 @@ const paywallNodeProps: PaywallNodeProps = {
 };
 
 export class PaywallNode extends generateDecoratorNode(paywallNodeProps) {
-    static importDOM() {
-        return parsePaywallNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parsePaywallNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/paywall/paywall-parser.js b/packages/kg-default-nodes/lib/nodes/paywall/paywall-parser.js
deleted file mode 100644
index 7b546fc258..0000000000
--- a/packages/kg-default-nodes/lib/nodes/paywall/paywall-parser.js
+++ /dev/null
@@ -1,16 +0,0 @@
-export function parsePaywallNode(PaywallNode) {
-    return {
-        '#comment': (nodeElem) => {
-            if (nodeElem.nodeType === 8 && nodeElem.nodeValue.trim() === 'members-only') {
-                return {
-                    conversion() {
-                        const node = new PaywallNode();
-                        return {node};
-                    },
-                    priority: 0
-                };
-            }
-            return null;
-        }
-    };
-}
diff --git a/packages/kg-default-nodes/lib/nodes/paywall/paywall-parser.ts b/packages/kg-default-nodes/lib/nodes/paywall/paywall-parser.ts
new file mode 100644
index 0000000000..ad32d1da21
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/paywall/paywall-parser.ts
@@ -0,0 +1,19 @@
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {$createPaywallNode} from './PaywallNode';
+
+export function parsePaywallNode(): DOMConversionMap | null {
+    return {
+        '#comment': (nodeElem: HTMLElement): DOMConversion | null => {
+            if (nodeElem.nodeType === 8 && nodeElem.nodeValue?.trim() === 'members-only') {
+                return {
+                    conversion(): DOMConversionOutput {
+                        const node = $createPaywallNode();
+                        return {node};
+                    },
+                    priority: 0
+                };
+            }
+            return null;
+        }
+    };
+}
diff --git a/packages/kg-default-nodes/lib/nodes/product/ProductNode.ts b/packages/kg-default-nodes/lib/nodes/product/ProductNode.ts
index c11c0811c7..f2bfaed0d2 100644
--- a/packages/kg-default-nodes/lib/nodes/product/ProductNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/product/ProductNode.ts
@@ -1,13 +1,13 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseProductNode} from './product-parser';
 import {renderProductNode} from './product-renderer';
 
 export type ProductNodeDataset = {
     productImageSrc?: string;
-    productImageWidth?: number;
-    productImageHeight?: number;
+    productImageWidth?: string;
+    productImageHeight?: string;
     productTitle?: string;
     productDescription?: string;
     productRatingEnabled?: boolean;
@@ -63,8 +63,8 @@ export class ProductNode extends generateDecoratorNode(productNodeProps) {
         return dataset;
     }
 
-    static importDOM() {
-        return parseProductNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseProductNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/product/product-parser.js b/packages/kg-default-nodes/lib/nodes/product/product-parser.ts
similarity index 69%
rename from packages/kg-default-nodes/lib/nodes/product/product-parser.js
rename to packages/kg-default-nodes/lib/nodes/product/product-parser.ts
index 95894887b8..e2bc8c1199 100644
--- a/packages/kg-default-nodes/lib/nodes/product/product-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/product/product-parser.ts
@@ -1,16 +1,18 @@
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
 import {readCaptionFromElement} from '../../utils/read-caption-from-element';
+import {$createProductNode, ProductNodeDataset} from './ProductNode';
 
-export function parseProductNode(ProductNode) {
+export function parseProductNode(): DOMConversionMap | null {
     return {
-        div: (nodeElem) => {
+        div: (nodeElem: HTMLElement): DOMConversion | null => {
             const isKgProductCard = nodeElem.classList?.contains('kg-product-card');
             if (nodeElem.tagName === 'DIV' && isKgProductCard) {
                 return {
-                    conversion(domNode) {
+                    conversion(domNode: HTMLElement): DOMConversionOutput | null {
                         const title = readCaptionFromElement(domNode, {selector: '.kg-product-card-title'});
                         const description = readCaptionFromElement(domNode, {selector: '.kg-product-card-description'});
 
-                        const payload = {
+                        const payload: ProductNodeDataset = {
                             productButtonEnabled: false,
                             productRatingEnabled: false,
                             productTitle: title,
@@ -19,15 +21,14 @@ export function parseProductNode(ProductNode) {
 
                         const img = domNode.querySelector('.kg-product-card-image');
                         if (img && img.getAttribute('src')) {
-                            payload.productImageSrc = img.getAttribute('src');
+                            const imgSrc = img.getAttribute('src');
+                            payload.productImageSrc = imgSrc ? imgSrc : undefined;
 
-                            if (img.getAttribute('width')) {
-                                payload.productImageWidth = img.getAttribute('width');
-                            }
+                            const width = img.getAttribute('width');
+                            payload.productImageWidth = width ? width : undefined;
 
-                            if (img.getAttribute('height')) {
-                                payload.productImageHeight = img.getAttribute('height');
-                            }
+                            const height = img.getAttribute('height');
+                            payload.productImageHeight = height ? height : undefined;
                         }
 
                         const stars = [...domNode.querySelectorAll('.kg-product-card-rating-active')].length;
@@ -53,7 +54,7 @@ export function parseProductNode(ProductNode) {
                             return null;
                         }
 
-                        const node = new ProductNode(payload);
+                        const node = $createProductNode(payload);
                         return {node};
                     },
                     priority: 1
@@ -64,7 +65,7 @@ export function parseProductNode(ProductNode) {
     };
 }
 
-function getButtonText(node) {
+function getButtonText(node: HTMLElement): string | null {
     let buttonText = node.textContent;
     if (buttonText) {
         buttonText = buttonText.replace(/\n/g, ' ').replace(/\s+/g, ' ').trim();
diff --git a/packages/kg-default-nodes/lib/nodes/signup/SignupNode.ts b/packages/kg-default-nodes/lib/nodes/signup/SignupNode.ts
index b7b054dccc..ab0cb6bf3f 100644
--- a/packages/kg-default-nodes/lib/nodes/signup/SignupNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/signup/SignupNode.ts
@@ -2,7 +2,7 @@
 import {signupParser} from './signup-parser';
 import {renderSignupCardToDOM} from './signup-renderer';
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
-import {LexicalNode, NodeKey} from 'lexical';
+import {DOMConversionMap, LexicalNode, NodeKey} from 'lexical';
 
 export type SignupNodeDataset = {
     alignment?: string;
@@ -69,8 +69,8 @@ export class SignupNode extends generateDecoratorNode(signupNodeProps) {
         this.__swapped = swapped || false;
     }
 
-    static importDOM() {
-        return signupParser(this);
+    static importDOM(): DOMConversionMap | null {
+        return signupParser();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/signup/signup-parser.js b/packages/kg-default-nodes/lib/nodes/signup/signup-parser.ts
similarity index 64%
rename from packages/kg-default-nodes/lib/nodes/signup/signup-parser.js
rename to packages/kg-default-nodes/lib/nodes/signup/signup-parser.ts
index 60845e7755..b507054892 100644
--- a/packages/kg-default-nodes/lib/nodes/signup/signup-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/signup/signup-parser.ts
@@ -1,11 +1,18 @@
-function rgbToHex(rgb) {
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {$createSignupNode, SignupNodeDataset} from './SignupNode';
+
+function rgbToHex(rgb: string): string | null {
     if (rgb === 'transparent') {
         return rgb;
     }
 
     try {
         // Extract the red, green, and blue values from the RGB string
-        const [r, g, b] = rgb.match(/\d+/g);
+        const match = rgb.match(/\d+/g);
+        if (!match) {
+            return null;
+        }
+        const [r, g, b] = match;
         // Convert each component to hexadecimal
         const red = parseInt(r, 10).toString(16).padStart(2, '0');
         const green = parseInt(g, 10).toString(16).padStart(2, '0');
@@ -18,7 +25,7 @@ function rgbToHex(rgb) {
     }
 }
 
-function getLayout(domNode) {
+function getLayout(domNode: HTMLElement): string {
     if (domNode.classList.contains('kg-layout-split')) {
         return 'split';
     } else if (domNode.classList.contains('kg-layout-full')) {
@@ -30,26 +37,31 @@ function getLayout(domNode) {
     }
 }
 
-export function signupParser(SignupNode) {
+export function signupParser(): DOMConversionMap | null {
     return {
-        div: (nodeElem) => {
+        div: (nodeElem: HTMLElement): DOMConversion | null => {
             const isSignupNode = nodeElem.dataset?.lexicalSignupForm === '';
             if (nodeElem.tagName === 'DIV' && isSignupNode) {
                 return {
-                    conversion(domNode) {
+                    conversion(domNode: HTMLElement): DOMConversionOutput {
                         const layout = getLayout(domNode);
                         const header = domNode.querySelector('h2')?.textContent || '';
                         const subheader = domNode.querySelector('h3')?.textContent || '';
                         const disclaimer = domNode.querySelector('p')?.textContent || '';
-                        const backgroundImageSrc = domNode.querySelector('.kg-signup-card-image')?.getAttribute('src');
+                        const backgroundImageElement = domNode.querySelector('.kg-signup-card-image');
+                        const backgroundImageSrc = backgroundImageElement?.getAttribute('src') || '';
                         const backgroundColor = domNode.style.backgroundColor || '';
-                        const buttonColor = domNode.querySelector('.kg-signup-card-button')?.style.backgroundColor || '';
-                        const buttonText = domNode.querySelector('.kg-signup-card-button-default')?.textContent?.trim() || 'Subscribe';
-                        const buttonTextColor = domNode.querySelector('.kg-signup-card-button')?.style.color || '';
-                        const textColor = domNode.querySelector('.kg-signup-card-success')?.style.color || '';
+                        const button = domNode.querySelector('.kg-signup-card-button') as HTMLElement;
+                        const buttonColor = button.style.backgroundColor || '';
+                        const buttonTextElement = domNode.querySelector('.kg-signup-card-button-default') as HTMLElement;
+                        const buttonText = buttonTextElement?.textContent || '';
+                        const buttonTextColor = buttonTextElement.style.color || '';
+                        const successText = domNode.querySelector('.kg-signup-card-success') as HTMLElement;
+                        const textColor = successText?.style.color || '';
                         const alignment = domNode.querySelector('.kg-signup-card-text')?.classList.contains('kg-align-center') ? 'center' : 'left';
                         const successMessage = domNode.querySelector('.kg-signup-card-success')?.textContent?.trim() || '';
-                        const labels = [...domNode.querySelectorAll('input[data-members-label]')].map(input => input.value);
+                        const labelElements = [...domNode.querySelectorAll('input[data-members-label]')] as HTMLInputElement[];
+                        const labels = labelElements.map(input => input.value);
 
                         const isAccentBackground = domNode.classList?.contains('kg-style-accent') ?? false;
                         const isAccentButton = domNode.querySelector('.kg-signup-card-button')?.classList?.contains('kg-style-accent') ?? false;
@@ -57,7 +69,7 @@ export function signupParser(SignupNode) {
                         const isSwapped = domNode.classList.contains('kg-swapped');
                         const backgroundSize = domNode.classList.contains('kg-content-wide') ? 'contain' : 'cover';
 
-                        const payload = {
+                        const payload: SignupNodeDataset = {
                             layout,
                             buttonText,
                             header,
@@ -75,7 +87,7 @@ export function signupParser(SignupNode) {
                             swapped: isSwapped
                         };
 
-                        const node = new SignupNode(payload);
+                        const node = $createSignupNode(payload);
                         return {node};
                     },
                     priority: 1
diff --git a/packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.ts b/packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.ts
index 7db36a0f64..17a3896bfb 100644
--- a/packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/toggle/ToggleNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseToggleNode} from './toggle-parser';
 import {renderToggleNode} from './toggle-renderer';
@@ -23,8 +23,8 @@ const toggleNodeProps: ToggleNodeProps = {
 };
 
 export class ToggleNode extends generateDecoratorNode(toggleNodeProps) {
-    static importDOM() {
-        return parseToggleNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseToggleNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/toggle/toggle-parser.js b/packages/kg-default-nodes/lib/nodes/toggle/toggle-parser.ts
similarity index 50%
rename from packages/kg-default-nodes/lib/nodes/toggle/toggle-parser.js
rename to packages/kg-default-nodes/lib/nodes/toggle/toggle-parser.ts
index 130496c42b..bdb57456a4 100644
--- a/packages/kg-default-nodes/lib/nodes/toggle/toggle-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/toggle/toggle-parser.ts
@@ -1,22 +1,25 @@
-export function parseToggleNode(ToggleNode) {
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {$createToggleNode, ToggleNodeDataset} from './ToggleNode';
+
+export function parseToggleNode(): DOMConversionMap | null {
     return {
-        div: (nodeElem) => {
+        div: (nodeElem: HTMLElement): DOMConversion | null => {
             const isKgToggleCard = nodeElem.classList?.contains('kg-toggle-card');
             if (nodeElem.tagName === 'DIV' && isKgToggleCard) {
                 return {
-                    conversion(domNode) {
+                    conversion(domNode: HTMLElement): DOMConversionOutput | null {
                         const headingNode = domNode.querySelector('.kg-toggle-heading-text');
-                        const heading = headingNode.textContent;
+                        const heading = headingNode?.textContent || '';
 
                         const contentNode = domNode.querySelector('.kg-toggle-content');
-                        const content = contentNode.textContent;
+                        const content = contentNode?.textContent || '';
 
-                        const payload = {
+                        const payload: ToggleNodeDataset = {
                             heading,
                             content
                         };
 
-                        const node = new ToggleNode(payload);
+                        const node = $createToggleNode(payload);
                         return {node};
                     },
                     priority: 1
diff --git a/packages/kg-default-nodes/lib/nodes/video/VideoNode.ts b/packages/kg-default-nodes/lib/nodes/video/VideoNode.ts
index 0ba07c4fbd..a96c39fc74 100644
--- a/packages/kg-default-nodes/lib/nodes/video/VideoNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/video/VideoNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {LexicalNode} from 'lexical';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {parseVideoNode} from './video-parser';
 import {renderVideoNode} from './video-renderer';
@@ -71,8 +71,8 @@ export class VideoNode extends generateDecoratorNode(videoNodeProps) {
         return dataset;
     }
 
-    static importDOM() {
-        return parseVideoNode(this);
+    static importDOM(): DOMConversionMap | null {
+        return parseVideoNode();
     }
 
     exportDOM(options = {}) {
diff --git a/packages/kg-default-nodes/lib/nodes/video/video-parser.js b/packages/kg-default-nodes/lib/nodes/video/video-parser.ts
similarity index 79%
rename from packages/kg-default-nodes/lib/nodes/video/video-parser.js
rename to packages/kg-default-nodes/lib/nodes/video/video-parser.ts
index de385941ce..7183c15dc3 100644
--- a/packages/kg-default-nodes/lib/nodes/video/video-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/video/video-parser.ts
@@ -1,13 +1,18 @@
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
 import {readCaptionFromElement} from '../../utils/read-caption-from-element';
+import {$createVideoNode, VideoNodeDataset} from './VideoNode';
 
-export function parseVideoNode(VideoNode) {
+export function parseVideoNode(): DOMConversionMap | null {
     return {
-        figure: (nodeElem) => {
+        figure: (nodeElem: HTMLElement): DOMConversion | null => {
             const isKgVideoCard = nodeElem.classList?.contains('kg-video-card');
             if (nodeElem.tagName === 'FIGURE' && isKgVideoCard) {
                 return {
-                    conversion(domNode) {
-                        const videoNode = domNode.querySelector('.kg-video-container video');
+                    conversion(domNode: HTMLElement): DOMConversionOutput | null {
+                        const videoNode = domNode.querySelector('.kg-video-container video') as HTMLVideoElement;
+                        if (!videoNode) {
+                            return null;
+                        }
                         const durationNode = domNode.querySelector('.kg-video-duration');
                         const videoSrc = videoNode && videoNode.src;
                         const videoWidth = videoNode && videoNode.width;
@@ -19,7 +24,7 @@ export function parseVideoNode(VideoNode) {
                             return null;
                         }
 
-                        const payload = {
+                        const payload: VideoNodeDataset = {
                             src: videoSrc,
                             loop: !!videoNode.loop,
                             cardWidth: getCardWidth(videoNode)
@@ -54,7 +59,7 @@ export function parseVideoNode(VideoNode) {
                             payload.height = videoHeight;
                         }
 
-                        const node = new VideoNode(payload);
+                        const node = $createVideoNode(payload);
                         return {node};
                     },
                     priority: 1
@@ -65,7 +70,7 @@ export function parseVideoNode(VideoNode) {
     };
 }
 
-function getCardWidth(domNode) {
+function getCardWidth(domNode: HTMLElement): string {
     if (domNode.classList.contains('kg-width-full')) {
         return 'full';
     } else if (domNode.classList.contains('kg-width-wide')) {
diff --git a/packages/kg-default-nodes/lib/utils/read-image-attributes-from-element.js b/packages/kg-default-nodes/lib/utils/read-image-attributes-from-element.js
deleted file mode 100644
index 47df9e0897..0000000000
--- a/packages/kg-default-nodes/lib/utils/read-image-attributes-from-element.js
+++ /dev/null
@@ -1,43 +0,0 @@
-export function readImageAttributesFromElement(element) {
-    const attrs = {};
-
-    if (element.src) {
-        attrs.src = element.src;
-    }
-
-    if (element.width) {
-        attrs.width = element.width;
-    } else if (element.dataset && element.dataset.width) {
-        attrs.width = parseInt(element.dataset.width, 10);
-    }
-
-    if (element.height) {
-        attrs.height = element.height;
-    } else if (element.dataset && element.dataset.height) {
-        attrs.height = parseInt(element.dataset.height, 10);
-    }
-
-    if ((!element.width && !element.height) && element.getAttribute('data-image-dimensions')) {
-        const [, width, height] = (/^(\d*)x(\d*)$/gi).exec(element.getAttribute('data-image-dimensions'));
-        attrs.width = parseInt(width, 10);
-        attrs.height = parseInt(height, 10);
-    }
-
-    if (element.alt) {
-        attrs.alt = element.alt;
-    }
-
-    if (element.title) {
-        attrs.title = element.title;
-    }
-
-    if (element.parentNode.tagName === 'A') {
-        const href = element.parentNode.href;
-
-        if (href !== attrs.src) {
-            attrs.href = href;
-        }
-    }
-
-    return attrs;
-}
diff --git a/packages/kg-default-nodes/lib/utils/read-image-attributes-from-element.ts b/packages/kg-default-nodes/lib/utils/read-image-attributes-from-element.ts
new file mode 100644
index 0000000000..d374de3926
--- /dev/null
+++ b/packages/kg-default-nodes/lib/utils/read-image-attributes-from-element.ts
@@ -0,0 +1,58 @@
+export type ImageAttributes = {
+    src?: string;
+    width?: number;
+    height?: number;
+    alt?: string;
+    title?: string;
+    href?: string;
+    fileName?: string; // used by GalleryNode
+    row?: number; // used by GalleryNode
+};
+
+export function readImageAttributesFromElement(element: HTMLImageElement): ImageAttributes {
+    const attrs: ImageAttributes = {};
+
+    if (element.src) {
+        attrs.src = element.src;
+    }
+
+    if (element.width) {
+        attrs.width = element.width;
+    } else if (element.dataset && element.dataset.width) {
+        attrs.width = parseInt(element.dataset.width, 10);
+    }
+
+    if (element.height) {
+        attrs.height = element.height;
+    } else if (element.dataset && element.dataset.height) {
+        attrs.height = parseInt(element.dataset.height, 10);
+    }
+
+    if ((!element.width && !element.height)) {
+        const dimensions = element.getAttribute('data-image-dimensions');
+        if (dimensions) {
+            const [, width, height] = (/^(\d*)x(\d*)$/gi).exec(dimensions) || [];
+            attrs.width = parseInt(width, 10);
+            attrs.height = parseInt(height, 10);
+        }
+    }
+
+    if (element.alt) {
+        attrs.alt = element.alt;
+    }
+
+    if (element.title) {
+        attrs.title = element.title;
+    }
+
+    const parentNode = element.parentNode as HTMLAnchorElement | null;
+    if (parentNode?.tagName === 'A') {
+        const href = parentNode?.href;
+
+        if (href !== attrs.src) {
+            attrs.href = href;
+        }
+    }
+
+    return attrs;
+}

From b91817eaf675b142c1bc90969360d772507be991 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Mon, 12 Feb 2024 13:53:33 -0600
Subject: [PATCH 23/33] fix callout test

---
 packages/kg-default-nodes/lib/nodes/callout/callout-parser.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kg-default-nodes/lib/nodes/callout/callout-parser.ts b/packages/kg-default-nodes/lib/nodes/callout/callout-parser.ts
index 5d5a5c2dbd..2c09cfb296 100644
--- a/packages/kg-default-nodes/lib/nodes/callout/callout-parser.ts
+++ b/packages/kg-default-nodes/lib/nodes/callout/callout-parser.ts
@@ -18,8 +18,8 @@ export function parseCalloutNode(): DOMConversionMap | null {
                         const color = getColorTag(domNode);
 
                         const payload = {
-                            calloutText: textNode && textNode.innerHTML.trim(),
-                            calloutEmoji: emojiNode && emojiNode.innerHTML.trim(),
+                            calloutText: textNode && textNode.innerHTML.trim() || '',
+                            calloutEmoji: emojiNode && emojiNode.innerHTML.trim() || '',
                             backgroundColor: color
                         } as CalloutNodeDataset;
 

From cf9c6ce854f2f30d2a8079ffca5fc516de3c604b Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Mon, 12 Feb 2024 14:42:52 -0600
Subject: [PATCH 24/33] fix header

---
 .../header/{HeaderNode.js => HeaderNode.ts}   | 54 ++++++++++++++-----
 .../{header-parser.js => header-parser.ts}    | 43 ++++++++-------
 2 files changed, 66 insertions(+), 31 deletions(-)
 rename packages/kg-default-nodes/lib/nodes/header/{HeaderNode.js => HeaderNode.ts} (61%)
 rename packages/kg-default-nodes/lib/nodes/header/parsers/{header-parser.js => header-parser.ts} (68%)

diff --git a/packages/kg-default-nodes/lib/nodes/header/HeaderNode.js b/packages/kg-default-nodes/lib/nodes/header/HeaderNode.ts
similarity index 61%
rename from packages/kg-default-nodes/lib/nodes/header/HeaderNode.js
rename to packages/kg-default-nodes/lib/nodes/header/HeaderNode.ts
index 9a0c447799..7bd1949364 100644
--- a/packages/kg-default-nodes/lib/nodes/header/HeaderNode.js
+++ b/packages/kg-default-nodes/lib/nodes/header/HeaderNode.ts
@@ -1,12 +1,41 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {generateDecoratorNode} from '../../generate-decorator-node';
+import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
 import {renderHeaderNodeV1} from './renderers/v1/header-renderer';
 import {parseHeaderNode} from './parsers/header-parser';
 // V2 imports below
 import {renderHeaderNodeV2} from './renderers/v2/header-renderer';
+import {DOMConversionMap, LexicalNode} from 'lexical';
 
-// This is our first node that has a custom version property
-export class HeaderNode extends generateDecoratorNode({nodeType: 'header',
+export type HeaderNodeDataset = {
+    size?: 'small' | 'large';
+    style?: 'dark' | 'light' | 'image' | 'text'; // v1 uses image/text, v2 uses dark/light
+    buttonEnabled?: boolean;
+    buttonUrl?: string;
+    buttonText?: string;
+    header?: string;
+    subheader?: string;
+    backgroundImageSrc?: string;
+    accentColor?: string;
+    alignment?: 'center' | 'left' | 'right';
+    backgroundColor?: string;
+    backgroundImageWidth?: number;
+    backgroundImageHeight?: number;
+    backgroundSize?: 'cover' | 'contain';
+    textColor?: string;
+    buttonColor?: string;
+    buttonTextColor?: string;
+    layout?: 'full' | 'split';
+    swapped?: boolean;
+    version?: 1 | 2;
+};
+
+type HeaderNodeProps = {
+    nodeType: 'header';
+    properties: KoenigDecoratorNodeProperties;
+};
+
+const headerNodeProps: HeaderNodeProps = {
+    nodeType: 'header',
     properties: [
         {name: 'size', default: 'small'},
         {name: 'style', default: 'dark'},
@@ -32,27 +61,28 @@ export class HeaderNode extends generateDecoratorNode({nodeType: 'header',
         {name: 'buttonTextColor', default: '#000000'},
         {name: 'layout', default: 'full'}, // replaces size
         {name: 'swapped', default: false}
-    ]}
-) {
-    static importDOM() {
-        return parseHeaderNode(this);
+    ]
+};
+
+// This is our first node that has a custom version property
+export class HeaderNode extends generateDecoratorNode(headerNodeProps) {
+    static importDOM(): DOMConversionMap | null {
+        return parseHeaderNode();
     }
 
     exportDOM(options = {}) {
         if (this.version === 1) {
             return renderHeaderNodeV1(this, options);
-        }
-
-        if (this.version === 2) {
+        } else {
             return renderHeaderNodeV2(this, options);
         }
     }
 }
 
-export const $createHeaderNode = (dataset) => {
+export const $createHeaderNode = (dataset: HeaderNodeDataset) => {
     return new HeaderNode(dataset);
 };
 
-export function $isHeaderNode(node) {
+export function $isHeaderNode(node: LexicalNode) {
     return node instanceof HeaderNode;
 }
diff --git a/packages/kg-default-nodes/lib/nodes/header/parsers/header-parser.js b/packages/kg-default-nodes/lib/nodes/header/parsers/header-parser.ts
similarity index 68%
rename from packages/kg-default-nodes/lib/nodes/header/parsers/header-parser.js
rename to packages/kg-default-nodes/lib/nodes/header/parsers/header-parser.ts
index 78e83c9050..ff8f34d5a0 100644
--- a/packages/kg-default-nodes/lib/nodes/header/parsers/header-parser.js
+++ b/packages/kg-default-nodes/lib/nodes/header/parsers/header-parser.ts
@@ -1,28 +1,32 @@
-export function parseHeaderNode(HeaderNode) {
+import {DOMConversion, DOMConversionMap, DOMConversionOutput} from 'lexical';
+import {$createHeaderNode, HeaderNodeDataset} from '../HeaderNode';
+
+export function parseHeaderNode(): DOMConversionMap | null {
     return {
-        div: (nodeElem) => {
+        div: (nodeElem: HTMLElement): DOMConversion | null => {
             const isHeaderCardv1 = nodeElem.classList?.contains('kg-header-card') && !nodeElem.classList?.contains('kg-v2');
             const isHeaderCardv2 = nodeElem.classList?.contains('kg-header-card') && nodeElem.classList?.contains('kg-v2');
             // v1 parser
             if (nodeElem.tagName === 'DIV' && isHeaderCardv1) {
                 return {
-                    conversion(domNode) {
+                    conversion(domNode: HTMLElement): DOMConversionOutput {
                         const div = domNode;
                         const headerElement = domNode.querySelector('.kg-header-card-header');
                         const subheaderElement = domNode.querySelector('.kg-header-card-subheader');
                         const buttonElement = domNode.querySelector('.kg-header-card-button');
                         const size = div.classList.contains('kg-size-large') ? 'large' : 'small';
                         const style = div.classList.contains('kg-style-image') ? 'image' : 'text';
-                        const backgroundImageSrc = div.getAttribute('data-kg-background-image');
+                        const backgroundImageSrc = div.getAttribute('data-kg-background-image') || undefined;
                         const hasHeader = !!headerElement;
-                        const header = hasHeader ? headerElement.textContent : '';
+                        const header = (hasHeader && headerElement.textContent) ? headerElement.textContent : undefined;
                         const hasSubheader = !!subheaderElement;
-                        const subheader = hasSubheader ? subheaderElement.textContent : '';
+                        const subheader = (hasSubheader && subheaderElement.textContent) ? subheaderElement.textContent : undefined;
                         const buttonEnabled = !!buttonElement;
-                        const buttonUrl = buttonEnabled ? buttonElement.getAttribute('href') : '';
-                        const buttonText = buttonEnabled ? buttonElement.textContent : '';
+                        const buttonHref = buttonElement?.getAttribute('href');
+                        const buttonUrl = (buttonEnabled && buttonHref) ? buttonHref : undefined;
+                        const buttonText = (buttonEnabled && buttonElement.textContent) ? buttonElement.textContent : undefined;
 
-                        const payload = {
+                        const payload: HeaderNodeDataset = {
                             size,
                             style,
                             backgroundImageSrc,
@@ -34,7 +38,7 @@ export function parseHeaderNode(HeaderNode) {
                             version: 1
                         };
 
-                        const node = new HeaderNode(payload);
+                        const node = $createHeaderNode(payload);
                         return {node};
                     },
                     priority: 1
@@ -44,25 +48,26 @@ export function parseHeaderNode(HeaderNode) {
             // V2 parser
             if (nodeElem.tagName === 'DIV' && isHeaderCardv2) {
                 return {
-                    conversion(domNode) {
+                    conversion(domNode): DOMConversionOutput {
                         const div = domNode;
                         const headerElement = div.querySelector('.kg-header-card-heading');
                         const subheaderElement = div.querySelector('.kg-header-card-subheading');
                         const buttonElement = div.querySelector('.kg-header-card-button');
-                        const alignment = div.classList.contains('kg-align-center') ? 'center' : '';
-                        const backgroundImageSrc = div.querySelector('.kg-header-card-image')?.getAttribute('src');
-                        const layout = backgroundImageSrc ? 'split' : '';
-                        const backgroundColor = div.classList.contains('kg-style-accent') ? 'accent' : div.getAttribute('data-background-color');
+                        const alignment = div.classList.contains('kg-align-center') ? 'center' : undefined;
+                        const backgroundImageSrc = div.querySelector('.kg-header-card-image')?.getAttribute('src') || undefined;
+                        const layout = backgroundImageSrc ? 'split' : undefined;
+                        const backgroundColor = div.classList.contains('kg-style-accent') ? 'accent' : div.getAttribute('data-background-color') || '';
                         const buttonColor = buttonElement?.getAttribute('data-button-color') || '';
                         const textColor = headerElement?.getAttribute('data-text-color') || '';
                         const buttonTextColor = buttonElement?.getAttribute('data-button-text-color') || '';
                         const header = headerElement?.textContent || '';
                         const subheader = subheaderElement?.textContent || '';
                         const buttonEnabled = !!buttonElement;
-                        const buttonUrl = buttonEnabled ? buttonElement.getAttribute('href') : '';
-                        const buttonText = buttonEnabled ? buttonElement.textContent : '';
+                        const buttonHref = buttonElement?.getAttribute('href');
+                        const buttonUrl = (buttonEnabled && buttonHref) ? buttonHref : undefined;
+                        const buttonText = (buttonEnabled && buttonElement.textContent) ? buttonElement.textContent : undefined;
 
-                        const payload = {
+                        const payload: HeaderNodeDataset = {
                             backgroundColor,
                             buttonColor,
                             alignment,
@@ -78,7 +83,7 @@ export function parseHeaderNode(HeaderNode) {
                             version: 2
                         };
 
-                        const node = new HeaderNode(payload);
+                        const node = $createHeaderNode(payload);
                         return {node};
                     },
                     priority: 1

From 535b35a0f2bcb148fbe9eaa198e0881ed49963c4 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Mon, 12 Feb 2024 15:05:10 -0600
Subject: [PATCH 25/33] update most utils

---
 .../kg-default-nodes/lib/nodes/types.d.ts     |  6 ++++
 ... => build-clean-basic-html-for-element.ts} |  6 ++--
 .../kg-default-nodes/lib/utils/clean-dom.js   | 14 --------
 .../kg-default-nodes/lib/utils/clean-dom.ts   | 35 +++++++++++++++++++
 .../utils/{escape-html.js => escape-html.ts}  |  4 +--
 ...ent-image.js => is-local-content-image.ts} |  2 +-
 .../lib/utils/is-unsplash-image.js            |  3 --
 .../lib/utils/is-unsplash-image.ts            |  3 ++
 ...lement.js => read-caption-from-element.ts} |  4 +--
 ...d-text-content.js => read-text-content.ts} |  4 +--
 ...container.js => render-empty-container.ts} |  2 +-
 ...ment-strings.js => replacement-strings.ts} | 16 +++------
 ...te-converter.js => size-byte-converter.ts} |  6 ++--
 .../lib/utils/{slugify.js => slugify.ts}      |  2 +-
 14 files changed, 63 insertions(+), 44 deletions(-)
 create mode 100644 packages/kg-default-nodes/lib/nodes/types.d.ts
 rename packages/kg-default-nodes/lib/utils/{build-clean-basic-html-for-element.js => build-clean-basic-html-for-element.ts} (64%)
 delete mode 100644 packages/kg-default-nodes/lib/utils/clean-dom.js
 create mode 100644 packages/kg-default-nodes/lib/utils/clean-dom.ts
 rename packages/kg-default-nodes/lib/utils/{escape-html.js => escape-html.ts} (72%)
 rename packages/kg-default-nodes/lib/utils/{is-local-content-image.js => is-local-content-image.ts} (67%)
 delete mode 100644 packages/kg-default-nodes/lib/utils/is-unsplash-image.js
 create mode 100644 packages/kg-default-nodes/lib/utils/is-unsplash-image.ts
 rename packages/kg-default-nodes/lib/utils/{read-caption-from-element.js => read-caption-from-element.ts} (76%)
 rename packages/kg-default-nodes/lib/utils/{read-text-content.js => read-text-content.ts} (85%)
 rename packages/kg-default-nodes/lib/utils/{render-empty-container.js => render-empty-container.ts} (90%)
 rename packages/kg-default-nodes/lib/utils/{replacement-strings.js => replacement-strings.ts} (69%)
 rename packages/kg-default-nodes/lib/utils/{size-byte-converter.js => size-byte-converter.ts} (78%)
 rename packages/kg-default-nodes/lib/utils/{slugify.js => slugify.ts} (87%)

diff --git a/packages/kg-default-nodes/lib/nodes/types.d.ts b/packages/kg-default-nodes/lib/nodes/types.d.ts
new file mode 100644
index 0000000000..658cf9a3c6
--- /dev/null
+++ b/packages/kg-default-nodes/lib/nodes/types.d.ts
@@ -0,0 +1,6 @@
+// fix cleanBasicHtml import
+declare module '@tryghost/kg-clean-basic-html' {
+    export default function cleanBasicHtml(html: string, options: {
+        createDocument: (htmlString: string) => Document;
+    }): string;
+}
\ No newline at end of file
diff --git a/packages/kg-default-nodes/lib/utils/build-clean-basic-html-for-element.js b/packages/kg-default-nodes/lib/utils/build-clean-basic-html-for-element.ts
similarity index 64%
rename from packages/kg-default-nodes/lib/utils/build-clean-basic-html-for-element.js
rename to packages/kg-default-nodes/lib/utils/build-clean-basic-html-for-element.ts
index cd08454670..87939c7ada 100644
--- a/packages/kg-default-nodes/lib/utils/build-clean-basic-html-for-element.js
+++ b/packages/kg-default-nodes/lib/utils/build-clean-basic-html-for-element.ts
@@ -1,9 +1,9 @@
 import cleanBasicHtml from '@tryghost/kg-clean-basic-html';
 
-export function buildCleanBasicHtmlForElement(domNode) {
-    return function _cleanBasicHtml(html) {
+export function buildCleanBasicHtmlForElement(domNode: HTMLElement) {
+    return function _cleanBasicHtml(html: string): string {
         const cleanedHtml = cleanBasicHtml(html, {
-            createDocument: (_html) => {
+            createDocument: (_html: string): Document => {
                 const newDoc = domNode.ownerDocument.implementation.createHTMLDocument();
                 newDoc.body.innerHTML = _html;
                 return newDoc;
diff --git a/packages/kg-default-nodes/lib/utils/clean-dom.js b/packages/kg-default-nodes/lib/utils/clean-dom.js
deleted file mode 100644
index aa66538b15..0000000000
--- a/packages/kg-default-nodes/lib/utils/clean-dom.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export function cleanDOM(node, allowedTags) {
-    for (let i = 0; i < node.childNodes.length; i++) {
-        let child = node.childNodes[i];
-        if (child.nodeType === 1 && !allowedTags.includes(child.tagName)) {
-            while (child.firstChild) {
-                node.insertBefore(child.firstChild, child);
-            }
-            node.removeChild(child);
-            i -= 1;
-        } else if (child.nodeType === 1) {
-            cleanDOM(child, allowedTags);
-        }
-    }
-}
diff --git a/packages/kg-default-nodes/lib/utils/clean-dom.ts b/packages/kg-default-nodes/lib/utils/clean-dom.ts
new file mode 100644
index 0000000000..a4e0f2659b
--- /dev/null
+++ b/packages/kg-default-nodes/lib/utils/clean-dom.ts
@@ -0,0 +1,35 @@
+import {LexicalNode} from 'lexical';
+
+// create a type with a key of one of the following tags
+type HTMLTags = [
+    'A',
+    'STRONG',
+    'EM',
+    'B',
+    'I',
+    'BR',
+    'CODE',
+    'MARK',
+    'S',
+    'DEL',
+    'U',
+    'SUP',
+    'SUB'
+]
+
+export type AllowedTags = Array<keyof HTMLTags>;
+
+export function cleanDOM(node: LexicalNode, allowedTags: AllowedTags) {
+    for (let i = 0; i < node.childNodes.length; i++) {
+        const child = node.childNodes[i];
+        if (child.nodeType === 1 && !allowedTags.includes(child.tagName)) {
+            while (child.firstChild) {
+                node.insertBefore(child.firstChild, child);
+            }
+            node.removeChild(child);
+            i -= 1;
+        } else if (child.nodeType === 1) {
+            cleanDOM(child, allowedTags);
+        }
+    }
+}
diff --git a/packages/kg-default-nodes/lib/utils/escape-html.js b/packages/kg-default-nodes/lib/utils/escape-html.ts
similarity index 72%
rename from packages/kg-default-nodes/lib/utils/escape-html.js
rename to packages/kg-default-nodes/lib/utils/escape-html.ts
index 11ac3527a8..f0bb463750 100644
--- a/packages/kg-default-nodes/lib/utils/escape-html.js
+++ b/packages/kg-default-nodes/lib/utils/escape-html.ts
@@ -1,9 +1,7 @@
 /**
  * Escape HTML special characters
- * @param {string} unsafe 
- * @returns string
  */
-export function escapeHtml(unsafe) {
+export function escapeHtml(unsafe: string): string {
     return unsafe
         .replace(/&/g, '&amp;')
         .replace(/</g, '&lt;')
diff --git a/packages/kg-default-nodes/lib/utils/is-local-content-image.js b/packages/kg-default-nodes/lib/utils/is-local-content-image.ts
similarity index 67%
rename from packages/kg-default-nodes/lib/utils/is-local-content-image.js
rename to packages/kg-default-nodes/lib/utils/is-local-content-image.ts
index 4384fed0bd..7439872bbd 100644
--- a/packages/kg-default-nodes/lib/utils/is-local-content-image.js
+++ b/packages/kg-default-nodes/lib/utils/is-local-content-image.ts
@@ -1,4 +1,4 @@
-export const isLocalContentImage = function (url, siteUrl = '') {
+export const isLocalContentImage = function (url: string, siteUrl: string = ''): boolean {
     const normalizedSiteUrl = siteUrl.replace(/\/$/, '');
     const imagePath = url.replace(normalizedSiteUrl, '');
     return /^(\/.*|__GHOST_URL__)\/?content\/images\//.test(imagePath);
diff --git a/packages/kg-default-nodes/lib/utils/is-unsplash-image.js b/packages/kg-default-nodes/lib/utils/is-unsplash-image.js
deleted file mode 100644
index 1f6e590e82..0000000000
--- a/packages/kg-default-nodes/lib/utils/is-unsplash-image.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const isUnsplashImage = function (url) {
-    return /images\.unsplash\.com/.test(url);
-};
diff --git a/packages/kg-default-nodes/lib/utils/is-unsplash-image.ts b/packages/kg-default-nodes/lib/utils/is-unsplash-image.ts
new file mode 100644
index 0000000000..bd0877dab1
--- /dev/null
+++ b/packages/kg-default-nodes/lib/utils/is-unsplash-image.ts
@@ -0,0 +1,3 @@
+export const isUnsplashImage = function (url: string): boolean {
+    return /images\.unsplash\.com/.test(url);
+};
diff --git a/packages/kg-default-nodes/lib/utils/read-caption-from-element.js b/packages/kg-default-nodes/lib/utils/read-caption-from-element.ts
similarity index 76%
rename from packages/kg-default-nodes/lib/utils/read-caption-from-element.js
rename to packages/kg-default-nodes/lib/utils/read-caption-from-element.ts
index 5d02d320f2..d0df08e5ca 100644
--- a/packages/kg-default-nodes/lib/utils/read-caption-from-element.js
+++ b/packages/kg-default-nodes/lib/utils/read-caption-from-element.ts
@@ -1,9 +1,9 @@
 import {buildCleanBasicHtmlForElement} from './build-clean-basic-html-for-element';
 
-export function readCaptionFromElement(element, {selector = 'figcaption'} = {}) {
+export function readCaptionFromElement(element: HTMLElement, {selector = 'figcaption'} = {}): string | undefined {
     const cleanBasicHtml = buildCleanBasicHtmlForElement(element);
 
-    let caption;
+    let caption: string | undefined;
 
     const figcaptions = Array.from(element.querySelectorAll(selector));
     if (figcaptions.length) {
diff --git a/packages/kg-default-nodes/lib/utils/read-text-content.js b/packages/kg-default-nodes/lib/utils/read-text-content.ts
similarity index 85%
rename from packages/kg-default-nodes/lib/utils/read-text-content.js
rename to packages/kg-default-nodes/lib/utils/read-text-content.ts
index 4c900e6ad7..94ac4ed418 100644
--- a/packages/kg-default-nodes/lib/utils/read-text-content.js
+++ b/packages/kg-default-nodes/lib/utils/read-text-content.ts
@@ -1,8 +1,8 @@
-import {$getRoot} from 'lexical';
+import {$getRoot, LexicalNode} from 'lexical';
 
 // when used nodes are used client-side their data attributes may be an editor
 // instance rather than a string in the case of nested editors
-export default function readTextContent(node, property) {
+export default function readTextContent(node: LexicalNode, property: string): string {
     const propertyName = `__${property}`;
     const propertyEditorName = `${propertyName}Editor`;
 
diff --git a/packages/kg-default-nodes/lib/utils/render-empty-container.js b/packages/kg-default-nodes/lib/utils/render-empty-container.ts
similarity index 90%
rename from packages/kg-default-nodes/lib/utils/render-empty-container.js
rename to packages/kg-default-nodes/lib/utils/render-empty-container.ts
index a4ac1c5f0a..83c7b4c8af 100644
--- a/packages/kg-default-nodes/lib/utils/render-empty-container.js
+++ b/packages/kg-default-nodes/lib/utils/render-empty-container.ts
@@ -6,7 +6,7 @@
  * @see @tryghost/kg-lexical-html-renderer package
  * @see https://github.com/TryGhost/Koenig/blob/e14c008e176f7a1036fe3f3deb924ed69a69191f/packages/kg-lexical-html-renderer/lib/convert-to-html-string.js#L29
  */
-export function renderEmptyContainer(document) {
+export function renderEmptyContainer(document: Document) {
     const emptyContainer = document.createElement('span');
     return {element: emptyContainer, type: 'inner'};
 }
diff --git a/packages/kg-default-nodes/lib/utils/replacement-strings.js b/packages/kg-default-nodes/lib/utils/replacement-strings.ts
similarity index 69%
rename from packages/kg-default-nodes/lib/utils/replacement-strings.js
rename to packages/kg-default-nodes/lib/utils/replacement-strings.ts
index f926b0d8ab..aa3d62ec24 100644
--- a/packages/kg-default-nodes/lib/utils/replacement-strings.js
+++ b/packages/kg-default-nodes/lib/utils/replacement-strings.ts
@@ -1,9 +1,7 @@
 /**
  * Removes consecutive whitespaces and newlines
- * @param {string} html
- * @returns {string}
  */
-export function removeSpaces(html) {
+export function removeSpaces(html: string): string {
     return html.replace(/\n/g, ' ').replace(/\s+/g, ' ').trim();
 }
 
@@ -11,10 +9,8 @@ export function removeSpaces(html) {
  * Wraps replacement strings with %%
  * This helps to prevent conflicts between code samples and our replacement strings
  * Example: {foo} -> %%{foo}%%
- * @param {string} html
- * @returns {string}
  */
-export function wrapReplacementStrings(html) {
+export function wrapReplacementStrings(html: string): string {
     return html.replace(/\{(\w*?)(?:,? *"(.*?)")?\}/g, '%%$&%%');
 }
 
@@ -22,10 +18,8 @@ export function wrapReplacementStrings(html) {
  * Removes any <code> wrappers around replacement strings {foo}
  * Example input:  <code><span>{foo}</span></code>
  * Example output:       <span>{foo}</span>
- * @param {string} html
- * @returns {string}
  */
-export function removeCodeWrappersFromHelpers(html,document) {
+export function removeCodeWrappersFromHelpers(html: string, document: Document): string {
     // parse html to make patterns easier to match
     const tempDiv = document.createElement('div');
     tempDiv.innerHTML = html;
@@ -34,9 +28,9 @@ export function removeCodeWrappersFromHelpers(html,document) {
     codeElements.forEach((codeElement) => {
         const codeTextContent = codeElement.textContent;
         // extract the content of the code element if it follows the helper pattern (e.g. {foo})
-        if (codeTextContent.match(/((.*?){.*?}(.*?))/gi)) {
+        if (codeTextContent && codeTextContent.match(/((.*?){.*?}(.*?))/gi)) {
             const codeContent = codeElement.innerHTML; 
-            codeElement.parentNode.replaceChild(document.createRange().createContextualFragment(codeContent), codeElement);
+            codeElement.parentNode?.replaceChild(document.createRange().createContextualFragment(codeContent), codeElement);
         }
     });
 
diff --git a/packages/kg-default-nodes/lib/utils/size-byte-converter.js b/packages/kg-default-nodes/lib/utils/size-byte-converter.ts
similarity index 78%
rename from packages/kg-default-nodes/lib/utils/size-byte-converter.js
rename to packages/kg-default-nodes/lib/utils/size-byte-converter.ts
index 38c4b0cdab..2ffe53b271 100644
--- a/packages/kg-default-nodes/lib/utils/size-byte-converter.js
+++ b/packages/kg-default-nodes/lib/utils/size-byte-converter.ts
@@ -1,4 +1,4 @@
-export function sizeToBytes(size) {
+export function sizeToBytes(size: string): number {
     if (!size) {
         return 0;
     }
@@ -13,7 +13,7 @@ export function sizeToBytes(size) {
     return Math.round(sizeNumber * Math.pow(1024, sizeUnitIndex));
 }
 
-export function bytesToSize(bytes) {
+export function bytesToSize(bytes: number): string {
     if (!bytes) {
         return '0 Byte';
     }
@@ -21,6 +21,6 @@ export function bytesToSize(bytes) {
     if (bytes === 0) {
         return '0 Byte';
     }
-    const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
+    const i = Math.floor(Math.log(bytes) / Math.log(1024));
     return Math.round((bytes / Math.pow(1024, i))) + ' ' + sizes[i];
 }
\ No newline at end of file
diff --git a/packages/kg-default-nodes/lib/utils/slugify.js b/packages/kg-default-nodes/lib/utils/slugify.ts
similarity index 87%
rename from packages/kg-default-nodes/lib/utils/slugify.js
rename to packages/kg-default-nodes/lib/utils/slugify.ts
index 84ce686978..f0063ad3ec 100644
--- a/packages/kg-default-nodes/lib/utils/slugify.js
+++ b/packages/kg-default-nodes/lib/utils/slugify.ts
@@ -1,4 +1,4 @@
-export function slugify(str) {
+export function slugify(str: string): string {
     // Remove HTML tags
     str = str.replace(/<[^>]*>?/gm, '');
 

From 2b94bb2a9f8a17b0bfee3da94ee015cec4b087a0 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Mon, 12 Feb 2024 15:47:25 -0600
Subject: [PATCH 26/33] update renderer options

---
 packages/kg-default-nodes/lib/nodes/types.d.ts |  2 +-
 packages/kg-default-nodes/lib/types.d.ts       | 18 ++++++++++++++++++
 ...option.js => add-create-document-option.ts} |  6 ++++--
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 packages/kg-default-nodes/lib/types.d.ts
 rename packages/kg-default-nodes/lib/utils/{add-create-document-option.js => add-create-document-option.ts} (78%)

diff --git a/packages/kg-default-nodes/lib/nodes/types.d.ts b/packages/kg-default-nodes/lib/nodes/types.d.ts
index 658cf9a3c6..93d473fc68 100644
--- a/packages/kg-default-nodes/lib/nodes/types.d.ts
+++ b/packages/kg-default-nodes/lib/nodes/types.d.ts
@@ -1,4 +1,4 @@
-// fix cleanBasicHtml import
+// TODO: fix cleanBasicHtml import until migrated to typescript
 declare module '@tryghost/kg-clean-basic-html' {
     export default function cleanBasicHtml(html: string, options: {
         createDocument: (htmlString: string) => Document;
diff --git a/packages/kg-default-nodes/lib/types.d.ts b/packages/kg-default-nodes/lib/types.d.ts
new file mode 100644
index 0000000000..f8bda513ae
--- /dev/null
+++ b/packages/kg-default-nodes/lib/types.d.ts
@@ -0,0 +1,18 @@
+import {NodeKey} from 'lexical';
+
+// see Ghost/ghost/core/core/server/lib/lexical.js
+export type RendererOptions = {
+    createDocument?: () => Document;
+    target?: 'email', // for rendering to email
+    dom: import('jsdom').JSDOM;
+    postUrl?: string, // used by email renderer
+    // NOTE: Leave this as any for now until we have a better understanding of how we will use the dynamic data
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    renderData?: Map<NodeKey, any>; // for rendering of data that requires external (dynamic) data
+    getCollectionPosts?: (collection: string, postCount: number) => Promise<[]>,
+    siteUrl?: string, // used for content/media
+    // TODO: imageOptimization comes from Ghost config but we don't have any type for it now and it would create more
+    //  trouble to define what we do have here than to leave it open ended.
+    imageOptimization?: object,
+    canTransformImage?: boolean,
+};
\ No newline at end of file
diff --git a/packages/kg-default-nodes/lib/utils/add-create-document-option.js b/packages/kg-default-nodes/lib/utils/add-create-document-option.ts
similarity index 78%
rename from packages/kg-default-nodes/lib/utils/add-create-document-option.js
rename to packages/kg-default-nodes/lib/utils/add-create-document-option.ts
index 686bf3971d..e93ba268b7 100644
--- a/packages/kg-default-nodes/lib/utils/add-create-document-option.js
+++ b/packages/kg-default-nodes/lib/utils/add-create-document-option.ts
@@ -1,6 +1,8 @@
+import type {RendererOptions} from '../types';
+
 // If we're in a browser environment, we can use the global document object,
 // but if we're in a non-browser environment, we need to be passed a `createDocument` function
-export function addCreateDocumentOption(options) {
+export function addCreateDocumentOption(options: RendererOptions) {
     if (!options.createDocument && options.dom) {
         options.createDocument = function () {
             return options.dom.window.document;
@@ -9,7 +11,7 @@ export function addCreateDocumentOption(options) {
 
     if (!options.createDocument) {
         /* c8 ignore start */
-        let document = typeof window !== 'undefined' && window.document;
+        const document = typeof window !== 'undefined' && window.document;
 
         if (!document) {
             throw new Error('Must be passed a `createDocument` function as an option when used in a non-browser environment'); // eslint-disable-line

From 84d673fb184b3945b28e89fc20c919e7a6b86bd3 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Tue, 13 Feb 2024 09:40:16 -0600
Subject: [PATCH 27/33] test exportDOM changes

---
 .../lib/generate-decorator-node.ts               |  5 +++++
 .../lib/nodes/email/EmailNode.ts                 | 16 ++++++++++++----
 .../{email-renderer.js => email-renderer.ts}     | 11 +++++++++--
 .../lib/utils/render-empty-container.ts          |  4 +++-
 4 files changed, 29 insertions(+), 7 deletions(-)
 rename packages/kg-default-nodes/lib/nodes/email/{email-renderer.js => email-renderer.ts} (66%)

diff --git a/packages/kg-default-nodes/lib/generate-decorator-node.ts b/packages/kg-default-nodes/lib/generate-decorator-node.ts
index 0c0f03789e..4c8331a683 100644
--- a/packages/kg-default-nodes/lib/generate-decorator-node.ts
+++ b/packages/kg-default-nodes/lib/generate-decorator-node.ts
@@ -16,6 +16,11 @@ export type KoenigDecoratorProperty = {
     wordCount?: boolean;
 };
 
+export type KoenigDecoratorRendererOutput = {
+    element: HTMLElement,
+    type?: 'inner' | 'value'; 
+}
+
 export type KoenigDecoratorNodeProperties = KoenigDecoratorProperty[];
 
 function validateArguments(nodeType: string, properties: KoenigDecoratorNodeProperties) {
diff --git a/packages/kg-default-nodes/lib/nodes/email/EmailNode.ts b/packages/kg-default-nodes/lib/nodes/email/EmailNode.ts
index 65a7636cad..a13553d44f 100644
--- a/packages/kg-default-nodes/lib/nodes/email/EmailNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/email/EmailNode.ts
@@ -1,7 +1,8 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {LexicalNode} from 'lexical';
-import {KoenigDecoratorNodeProperties, generateDecoratorNode} from '../../generate-decorator-node';
+import {DOMExportOutput, LexicalEditor, LexicalNode} from 'lexical';
+import {KoenigDecoratorNodeProperties, KoenigDecoratorRendererOutput, generateDecoratorNode} from '../../generate-decorator-node';
 import {renderEmailNode} from './email-renderer';
+import {RendererOptions} from '../../types';
 
 export type EmailNodeDataset = {
     html?: string;
@@ -20,8 +21,15 @@ const emailNodeProps: EmailNodeProps = {
 };
 
 export class EmailNode extends generateDecoratorNode(emailNodeProps) {
-    exportDOM(options = {}) {
-        return renderEmailNode(this, options);
+    exportDOM(options: LexicalEditor): DOMExportOutput;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    exportDOM(options: RendererOptions): KoenigDecoratorRendererOutput
+
+    exportDOM(options: LexicalEditor | RendererOptions) {
+        if (this instanceof EmailNode) {
+            return renderEmailNode(this, options as RendererOptions);
+        }
+        return super.exportDOM(options as unknown as LexicalEditor);
     }
 }
 
diff --git a/packages/kg-default-nodes/lib/nodes/email/email-renderer.js b/packages/kg-default-nodes/lib/nodes/email/email-renderer.ts
similarity index 66%
rename from packages/kg-default-nodes/lib/nodes/email/email-renderer.js
rename to packages/kg-default-nodes/lib/nodes/email/email-renderer.ts
index 127e49ba33..8c5ca9482e 100644
--- a/packages/kg-default-nodes/lib/nodes/email/email-renderer.js
+++ b/packages/kg-default-nodes/lib/nodes/email/email-renderer.ts
@@ -1,10 +1,17 @@
 import {addCreateDocumentOption} from '../../utils/add-create-document-option';
 import {removeSpaces, removeCodeWrappersFromHelpers, wrapReplacementStrings} from '../../utils/replacement-strings';
 import {renderEmptyContainer} from '../../utils/render-empty-container';
+import {EmailNode} from './EmailNode';
+import {RendererOptions} from '../../types';
+import {KoenigDecoratorRendererOutput} from '../../generate-decorator-node';
 
-export function renderEmailNode(node, options = {}) {
+export function renderEmailNode(node: EmailNode, options: RendererOptions): KoenigDecoratorRendererOutput | null {
     addCreateDocumentOption(options);
-    const document = options.createDocument();
+    const document = options.createDocument && options.createDocument();
+
+    if (!document) {
+        return null;
+    }
 
     const html = node.html;
 
diff --git a/packages/kg-default-nodes/lib/utils/render-empty-container.ts b/packages/kg-default-nodes/lib/utils/render-empty-container.ts
index 83c7b4c8af..783fe1463c 100644
--- a/packages/kg-default-nodes/lib/utils/render-empty-container.ts
+++ b/packages/kg-default-nodes/lib/utils/render-empty-container.ts
@@ -1,3 +1,5 @@
+import {KoenigDecoratorRendererOutput} from '../generate-decorator-node';
+
 /*
  * Renders an empty container element
  * In the returned object, `type: 'inner'` is picked up by the `@tryghost/kg-lexical-html-renderer` package
@@ -6,7 +8,7 @@
  * @see @tryghost/kg-lexical-html-renderer package
  * @see https://github.com/TryGhost/Koenig/blob/e14c008e176f7a1036fe3f3deb924ed69a69191f/packages/kg-lexical-html-renderer/lib/convert-to-html-string.js#L29
  */
-export function renderEmptyContainer(document: Document) {
+export function renderEmptyContainer(document: Document): KoenigDecoratorRendererOutput {
     const emptyContainer = document.createElement('span');
     return {element: emptyContainer, type: 'inner'};
 }

From f689b945c3a98a47f65c386d3ff635eb4b8060ce Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 15:28:33 -0600
Subject: [PATCH 28/33] Updated lexical to v0.13.1 (#1079)

no refs
- updated lexical to the latest release
- this brings various fixes and improvements that are not listed here; we were held up for a while by waiting for changes that we needed after the `insertNodes` changes in lexical 0.12.3
- changes to lexical types in 0.13.0 necessitate some type declarations and finagling that were not necessary before, and are pushing us to migrate all Koenig code over to typescript as a result
---
 .../lib/nodes/ExtendedTextNode.ts             |   4 +
 packages/kg-default-nodes/package.json        |  14 +-
 packages/kg-default-transforms/package.json   |  12 +-
 .../src/default-transforms.ts                 |   2 +-
 .../src/transforms/denest.ts                  |   7 +-
 .../src/transforms/merge-list-nodes.ts        |   6 +-
 .../kg-default-transforms/src/typings.d.ts    |   6 +-
 .../test/transforms/denest.test.ts            |   4 +-
 packages/kg-html-to-lexical/package.json      |  14 +-
 .../lib/LexicalHTMLRenderer.ts                |   6 +-
 .../lib/convert-to-html-string.ts             |  34 +-
 .../lib/get-dynamic-data-nodes.ts             |  16 +-
 .../lib/kg-default-nodes.d.ts                 |  27 ++
 .../lib/kg-utils.d.ts                         |   3 +
 .../lib/transformers/element/aside.ts         |   9 +-
 .../lib/transformers/element/blockquote.ts    |   6 +-
 .../lib/transformers/element/heading.ts       |   6 +-
 .../lib/transformers/element/list.ts          |  11 +-
 .../lib/transformers/element/paragraph.ts     |   6 +-
 .../lib/transformers/index.ts                 |  10 +-
 .../lib/utils/TextContent.ts                  |  24 +-
 .../lib/utils/generate-id.ts                  |   7 +-
 .../kg-lexical-html-renderer/package.json     |  14 +-
 packages/koenig-lexical/package.json          |  15 +-
 .../src/components/ui/UnsplashPlugin.jsx      |   2 +-
 .../ui/cards/BookmarkCard.stories.jsx         |   2 +-
 .../ui/cards/CalloutCard.stories.jsx          |   2 +-
 .../ui/cards/CodeBlockCard.stories.jsx        |   2 +-
 .../ui/cards/CollectionCard.stories.jsx       |   2 +-
 .../components/ui/cards/EmailCard.stories.jsx |   2 +-
 .../ui/cards/EmailCtaCard.stories.jsx         |   2 +-
 .../components/ui/cards/EmbedCard.stories.jsx |   2 +-
 .../ui/cards/GalleryCard.stories.jsx          |   2 +-
 .../HeaderCard/v1/HeaderCard.v1.stories.jsx   |   4 +-
 .../HeaderCard/v2/HeaderCard.v2.stories.jsx   |   4 +-
 .../components/ui/cards/ImageCard.stories.jsx |   2 +-
 .../ui/cards/ProductCard.stories.jsx          |   4 +-
 .../ui/cards/SignupCard.stories.jsx           |   6 +-
 .../ui/cards/ToggleCard.stories.jsx           |   4 +-
 .../components/ui/cards/VideoCard.stories.jsx |   2 +-
 .../koenig-lexical/src/nodes/BookmarkNode.jsx |   2 +-
 .../koenig-lexical/src/nodes/CalloutNode.jsx  |   2 +-
 .../src/nodes/CodeBlockNode.jsx               |   2 +-
 .../src/nodes/CollectionNode.jsx              |   2 +-
 .../koenig-lexical/src/nodes/EmbedNode.jsx    |   2 +-
 .../koenig-lexical/src/nodes/GalleryNode.jsx  |   2 +-
 .../koenig-lexical/src/nodes/HeaderNode.jsx   |   4 +-
 .../koenig-lexical/src/nodes/ImageNode.jsx    |   2 +-
 .../koenig-lexical/src/nodes/ProductNode.jsx  |   2 +-
 .../koenig-lexical/src/nodes/SignupNode.jsx   |   6 +-
 .../koenig-lexical/src/nodes/ToggleNode.jsx   |   2 +-
 .../koenig-lexical/src/nodes/VideoNode.jsx    |   2 +-
 .../src/plugins/HtmlOutputPlugin.jsx          |  22 +-
 .../src/plugins/KoenigBehaviourPlugin.jsx     |  35 +-
 .../src/utils/$insertAndSelectNode.js         |   3 +-
 .../src/utils/generateEditorState.js          |   7 +-
 .../src/utils/nested-editors.js               |   1 +
 .../e2e/plugins/EmojiPickerPlugin.test.js     |   4 +-
 yarn.lock                                     | 301 +++++++++---------
 59 files changed, 373 insertions(+), 337 deletions(-)
 create mode 100644 packages/kg-lexical-html-renderer/lib/kg-default-nodes.d.ts
 create mode 100644 packages/kg-lexical-html-renderer/lib/kg-utils.d.ts

diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts b/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
index a5ad81d556..b40a98760a 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
@@ -51,6 +51,10 @@ export class ExtendedTextNode extends TextNode {
             this.__mode === 0
         );
     }
+
+    isInline() {
+        return true;
+    }
 }
 
 // ignore no implicit any
diff --git a/packages/kg-default-nodes/package.json b/packages/kg-default-nodes/package.json
index 50b1463095..7d7526da03 100644
--- a/packages/kg-default-nodes/package.json
+++ b/packages/kg-default-nodes/package.json
@@ -32,8 +32,8 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-syntax-import-assertions": "^7.20.0",
-    "@lexical/headless": "0.12.2",
-    "@lexical/html": "0.12.2",
+    "@lexical/headless": "0.13.1",
+    "@lexical/html": "0.13.1",
     "@prettier/sync": "^0.3.0",
     "@rollup/plugin-babel": "6.0.4",
     "c8": "9.1.0",
@@ -46,15 +46,15 @@
     "typescript": "^5.2.0"
   },
   "dependencies": {
-    "@lexical/clipboard": "0.12.2",
-    "@lexical/rich-text": "0.12.2",
-    "@lexical/selection": "0.12.2",
-    "@lexical/utils": "0.12.2",
+    "@lexical/clipboard": "0.13.1",
+    "@lexical/rich-text": "0.13.1",
+    "@lexical/selection": "0.13.1",
+    "@lexical/utils": "0.13.1",
     "@tryghost/kg-clean-basic-html": "^4.0.3",
     "@tryghost/kg-markdown-html-renderer": "^7.0.2",
     "html-minifier": "^4.0.0",
     "jsdom": "^23.0.0",
-    "lexical": "0.12.2",
+    "lexical": "0.13.1",
     "lodash": "^4.17.21",
     "luxon": "^3.3.0"
   }
diff --git a/packages/kg-default-transforms/package.json b/packages/kg-default-transforms/package.json
index 8b5150f8c9..9c3b68c1ce 100644
--- a/packages/kg-default-transforms/package.json
+++ b/packages/kg-default-transforms/package.json
@@ -25,8 +25,8 @@
     "access": "public"
   },
   "devDependencies": {
-    "@lexical/headless": "0.12.2",
-    "@lexical/link": "0.12.2",
+    "@lexical/headless": "0.13.1",
+    "@lexical/link": "0.13.1",
     "c8": "9.1.0",
     "mocha": "10.2.0",
     "sinon": "17.0.1",
@@ -34,10 +34,10 @@
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "@lexical/list": "0.12.2",
-    "@lexical/rich-text": "0.12.2",
-    "@lexical/utils": "0.12.2",
+    "@lexical/list": "0.13.1",
+    "@lexical/rich-text": "0.13.1",
+    "@lexical/utils": "0.13.1",
     "@tryghost/kg-default-nodes": "^1.0.7",
-    "lexical": "0.12.2"
+    "lexical": "0.13.1"
   }
 }
diff --git a/packages/kg-default-transforms/src/default-transforms.ts b/packages/kg-default-transforms/src/default-transforms.ts
index cb6adb3d8c..3a542729e4 100644
--- a/packages/kg-default-transforms/src/default-transforms.ts
+++ b/packages/kg-default-transforms/src/default-transforms.ts
@@ -23,7 +23,7 @@ export function registerDefaultTransforms(editor: LexicalEditor) {
         // fix invalid nesting of nodes
         registerDenestTransform(editor, ParagraphNode, () => ($createParagraphNode())),
         registerDenestTransform(editor, HeadingNode, node => ($createHeadingNode(node.getTag()))),
-        registerDenestTransform(editor, ExtendedHeadingNode, node => ($createHeadingNode(node.getTag()))),
+        registerDenestTransform(editor, ExtendedHeadingNode, (node: ExtendedHeadingNode) => ($createHeadingNode(node.getTag()))),
         registerDenestTransform(editor, QuoteNode, () => ($createQuoteNode())),
         registerDenestTransform(editor, ListNode, node => ($createListNode(node.getListType(), node.getStart()))),
         registerDenestTransform(editor, ListItemNode, () => ($createListItemNode())),
diff --git a/packages/kg-default-transforms/src/transforms/denest.ts b/packages/kg-default-transforms/src/transforms/denest.ts
index 7457f8dabb..b7873faab3 100644
--- a/packages/kg-default-transforms/src/transforms/denest.ts
+++ b/packages/kg-default-transforms/src/transforms/denest.ts
@@ -1,5 +1,5 @@
 import {$isListItemNode, $isListNode} from '@lexical/list';
-import {ElementNode, $createParagraphNode, LexicalEditor, LexicalNode, Klass, $getRoot, $isRootNode} from 'lexical';
+import {ElementNode, $createParagraphNode, LexicalEditor, LexicalNode, Klass, $getRoot, $isRootNode, $isTextNode, $isLineBreakNode} from 'lexical';
 
 export type CreateNodeFn<T extends LexicalNode> = (originalNode: T) => T;
 
@@ -43,6 +43,9 @@ function $isInvalidListItemNode(node: LexicalNode) {
 // non-inline nodes can only exist at top-level inside a root node
 // ignore list and list item nodes because they aren't inline but can be nested inside each other
 function $isInvalidChildNode(node: LexicalNode) {
+    if ($isLineBreakNode(node) || $isTextNode(node)) { // line break and text nodes don't have an isInline method
+        return false;
+    }
     return $isInvalidListNode(node)
         || $isInvalidListItemNode(node)
         || node.isInline && !node.isInline() && !$isListNode(node) && !$isListItemNode(node);
@@ -97,7 +100,7 @@ export function denestTransform<T extends ElementNode>(node: T, createNode: Crea
     // meaning first child needs to be inserted last to maintain order.
     tempParagraph.getChildren().reverse().forEach((child) => {
         // ensure we don't add list items directly into root node
-        // TODO: can we handle this elsewhere/more genericly?
+        // TODO: can we handle this elsewhere/more generically?
         if ($isRootNode(parent.getParent()) && $isListItemNode(child)) {
             const paragraphNode = $createParagraphNode();
             paragraphNode.append(...child.getChildren());
diff --git a/packages/kg-default-transforms/src/transforms/merge-list-nodes.ts b/packages/kg-default-transforms/src/transforms/merge-list-nodes.ts
index 7c6dcd0446..2ca7d9af18 100644
--- a/packages/kg-default-transforms/src/transforms/merge-list-nodes.ts
+++ b/packages/kg-default-transforms/src/transforms/merge-list-nodes.ts
@@ -1,10 +1,10 @@
 import {$isListNode, ListNode} from '@lexical/list';
-import {LexicalEditor, LexicalNode} from 'lexical';
+import {LexicalEditor} from 'lexical';
 
-export function mergeListNodesTransform(node: LexicalNode) {
+export function mergeListNodesTransform(node: ListNode) {
     const nextSibling = node.getNextSibling();
 
-    if ($isListNode(nextSibling) && nextSibling.getListType() === node.getListType()) {
+    if ($isListNode(nextSibling) && $isListNode(node) && nextSibling.getListType() === node.getListType()) {
         node.append(...nextSibling.getChildren());
         nextSibling.remove();
     }
diff --git a/packages/kg-default-transforms/src/typings.d.ts b/packages/kg-default-transforms/src/typings.d.ts
index 804da2ff4d..bdcc3560d5 100644
--- a/packages/kg-default-transforms/src/typings.d.ts
+++ b/packages/kg-default-transforms/src/typings.d.ts
@@ -1 +1,5 @@
-declare module '@tryghost/kg-default-nodes';
+declare module '@tryghost/kg-default-nodes' {
+    import {DEFAULT_NODES, ExtendedHeadingNode, ImageNode} from '@tryghost/kg-default-nodes';
+
+    export {DEFAULT_NODES, ExtendedHeadingNode, ImageNode};
+};
diff --git a/packages/kg-default-transforms/test/transforms/denest.test.ts b/packages/kg-default-transforms/test/transforms/denest.test.ts
index ea5093bfea..ba7eee8012 100644
--- a/packages/kg-default-transforms/test/transforms/denest.test.ts
+++ b/packages/kg-default-transforms/test/transforms/denest.test.ts
@@ -456,7 +456,7 @@ describe('Denest transform', function () {
         const registerTransforms = (editor: LexicalEditor) => {
             registerDenestTransform(editor, ParagraphNode, () => ($createParagraphNode()));
             registerDenestTransform(editor, HeadingNode, node => ($createHeadingNode(node.getTag())));
-            registerDenestTransform(editor, ExtendedHeadingNode, node => ($createHeadingNode(node.getTag())));
+            registerDenestTransform(editor, ExtendedHeadingNode, (node: ExtendedHeadingNode) => ($createHeadingNode(node.getTag())));
             registerDenestTransform(editor, ListNode, node => ($createListNode(node.getListType(), node.getStart())));
             registerDenestTransform(editor, ListItemNode, () => ($createListItemNode()));
         };
@@ -880,7 +880,7 @@ describe('Denest transform', function () {
         const registerTransforms = (editor: LexicalEditor) => {
             registerDenestTransform(editor, ParagraphNode, () => ($createParagraphNode()));
             registerDenestTransform(editor, HeadingNode, node => ($createHeadingNode(node.getTag())));
-            registerDenestTransform(editor, ExtendedHeadingNode, node => ($createHeadingNode(node.getTag())));
+            registerDenestTransform(editor, ExtendedHeadingNode, (node: ExtendedHeadingNode) => ($createHeadingNode(node.getTag())));
             registerDenestTransform(editor, ListNode, node => ($createListNode(node.getListType(), node.getStart())));
             registerDenestTransform(editor, ListItemNode, () => ($createListItemNode()));
         };
diff --git a/packages/kg-html-to-lexical/package.json b/packages/kg-html-to-lexical/package.json
index 6df479ba67..e609f2d978 100644
--- a/packages/kg-html-to-lexical/package.json
+++ b/packages/kg-html-to-lexical/package.json
@@ -36,15 +36,15 @@
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "@lexical/clipboard": "0.12.2",
-    "@lexical/headless": "0.12.2",
-    "@lexical/html": "0.12.2",
-    "@lexical/link": "0.12.2",
-    "@lexical/list": "0.12.2",
-    "@lexical/rich-text": "0.12.2",
+    "@lexical/clipboard": "0.13.1",
+    "@lexical/headless": "0.13.1",
+    "@lexical/html": "0.13.1",
+    "@lexical/link": "0.13.1",
+    "@lexical/list": "0.13.1",
+    "@lexical/rich-text": "0.13.1",
     "@tryghost/kg-default-nodes": "^1.0.7",
     "@tryghost/kg-default-transforms": "^1.0.8",
     "jsdom": "^23.0.0",
-    "lexical": "0.12.2"
+    "lexical": "0.13.1"
   }
 }
diff --git a/packages/kg-lexical-html-renderer/lib/LexicalHTMLRenderer.ts b/packages/kg-lexical-html-renderer/lib/LexicalHTMLRenderer.ts
index 9e31323ef3..12dec4d8e5 100644
--- a/packages/kg-lexical-html-renderer/lib/LexicalHTMLRenderer.ts
+++ b/packages/kg-lexical-html-renderer/lib/LexicalHTMLRenderer.ts
@@ -60,7 +60,11 @@ export default class LexicalHTMLRenderer {
 
         // fetch dynamic data
         const renderData = new Map();
-        await Promise.all(dynamicDataNodes.map(async (node: LexicalNode) => {
+        await Promise.all(dynamicDataNodes.map(async (node) => {
+            if (!node.getDynamicData) {
+                return;
+            }
+
             const {key, data} = await node.getDynamicData(options);
             renderData.set(key, data);
         }));
diff --git a/packages/kg-lexical-html-renderer/lib/convert-to-html-string.ts b/packages/kg-lexical-html-renderer/lib/convert-to-html-string.ts
index 389b6965a3..1c09863bcf 100644
--- a/packages/kg-lexical-html-renderer/lib/convert-to-html-string.ts
+++ b/packages/kg-lexical-html-renderer/lib/convert-to-html-string.ts
@@ -1,18 +1,10 @@
 import {ElementNode, LexicalNode} from 'lexical';
 import {$getRoot, $isElementNode, $isLineBreakNode, $isParagraphNode, $isTextNode} from 'lexical';
 import {$isLinkNode} from '@lexical/link';
-// TODO: update once kg-default-nodes is typescript
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const {$isKoenigCard, KoenigDecoratorNode} = require('@tryghost/kg-default-nodes');
+import {$isKoenigCard, RendererOptions} from '@tryghost/kg-default-nodes';
 import TextContent from './utils/TextContent';
 import elementTransformers from './transformers';
 
-export interface RendererOptions {
-    usedIdAttributes?: Record<string, number>;
-    dom?: import('jsdom').JSDOM,
-    type?: 'inner' | 'outer' | 'value'
-}
-
 export default function $convertToHtmlString(options: RendererOptions = {}): string {
     const output: string[] = [];
     const children: LexicalNode[] = $getRoot().getChildren();
@@ -37,7 +29,7 @@ export default function $convertToHtmlString(options: RendererOptions = {}): str
     return output.join('');
 }
 
-function exportTopLevelElementOrDecorator(node: LexicalNode | typeof KoenigDecoratorNode, options: RendererOptions): string | null {
+function exportTopLevelElementOrDecorator(node: LexicalNode, options: RendererOptions): string | null {
     if ($isKoenigCard(node)) {
         // NOTE: kg-default-nodes appends type in rare cases to make use of this functionality... with moving to typescript,
         //  we should change this implementation because it's confusing, or we should override the DOMExportOutput type
@@ -47,19 +39,25 @@ function exportTopLevelElementOrDecorator(node: LexicalNode | typeof KoenigDecor
         case 'inner':
             return element.innerHTML;
         case 'value':
-            return element.value;
+            if ('value' in element) {
+                return element.value;
+            }
+
+            return '';
         default:
             return element.outerHTML;
         }
     }
 
-    // note: unsure why this type isn't being picked up from the import
-    for (const transformer of elementTransformers) {
-        if (transformer.export !== null) {
-            const result = transformer.export(node, options, _node => exportChildren(_node, options));
+    if ($isElementNode(node)) {
+        // note: unsure why this type isn't being picked up from the import
+        for (const transformer of elementTransformers) {
+            if (transformer.export !== null) {
+                const result = transformer.export(node, options, _node => exportChildren(_node, options));
 
-            if (result !== null) {
-                return result;
+                if (result !== null) {
+                    return result;
+                }
             }
         }
     }
@@ -67,7 +65,7 @@ function exportTopLevelElementOrDecorator(node: LexicalNode | typeof KoenigDecor
     return $isElementNode(node) ? exportChildren(node, options) : null;
 }
 
-function exportChildren(node: ElementNode | LexicalNode, options: RendererOptions): string {
+function exportChildren(node: ElementNode, options: RendererOptions): string {
     const output = [];
     const children = node.getChildren();
 
diff --git a/packages/kg-lexical-html-renderer/lib/get-dynamic-data-nodes.ts b/packages/kg-lexical-html-renderer/lib/get-dynamic-data-nodes.ts
index c31aba21cf..76866e08ba 100644
--- a/packages/kg-lexical-html-renderer/lib/get-dynamic-data-nodes.ts
+++ b/packages/kg-lexical-html-renderer/lib/get-dynamic-data-nodes.ts
@@ -1,18 +1,16 @@
-import type {EditorState, LexicalNode} from 'lexical';
-
 import {$getRoot} from 'lexical';
-// TODO: update to import when this is moved to typescript
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const {$isKoenigCard} = require('@tryghost/kg-default-nodes');
+import {$isKoenigCard, KoenigDecoratorNode} from '@tryghost/kg-default-nodes';
+
+import type {EditorState} from 'lexical';
 
-export default function getDynamicDataNodes(editorState: EditorState) {
-    const dynamicNodes: LexicalNode[] = [];
+export default function getDynamicDataNodes(editorState: EditorState): KoenigDecoratorNode[] {
+    const dynamicNodes: KoenigDecoratorNode[] = [];
 
     editorState.read(() => {
         const root = $getRoot();
         const nodes = root.getChildren();
 
-        nodes.forEach((node: LexicalNode) => {
+        nodes.forEach((node) => {
             if ($isKoenigCard(node) && node.hasDynamicData?.()) {
                 dynamicNodes.push(node);
             }
@@ -20,4 +18,4 @@ export default function getDynamicDataNodes(editorState: EditorState) {
     });
 
     return dynamicNodes;
-}
\ No newline at end of file
+}
diff --git a/packages/kg-lexical-html-renderer/lib/kg-default-nodes.d.ts b/packages/kg-lexical-html-renderer/lib/kg-default-nodes.d.ts
new file mode 100644
index 0000000000..32e9f8605a
--- /dev/null
+++ b/packages/kg-lexical-html-renderer/lib/kg-default-nodes.d.ts
@@ -0,0 +1,27 @@
+declare module '@tryghost/kg-default-nodes' {
+    import {LexicalNode, DecoratorNode, LexicalEditor, ElementNode} from 'lexical';
+    import * as KgDefaultNodes from '@tryghost/kg-default-nodes';
+
+    export interface RendererOptions {
+        usedIdAttributes?: Record<string, number>;
+        dom?: import('jsdom').JSDOM,
+        type?: 'inner' | 'outer' | 'value'
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    type X = any;
+
+    export class KoenigDecoratorNode extends DecoratorNode<X> {
+        // TODO: exportDOM override isn't directly compatible with base class, should fix when converting kg-default-nodes
+        exportDOM(options: LexicalEditor | RendererOptions): {
+            element: HTMLElement | HTMLInputElement | HTMLTextAreaElement;
+            type: 'inner' | 'outer' | 'value'
+        };
+        hasDynamicData?(): boolean;
+        getDynamicData?(options: RendererOptions): Promise<{key: number; data: unknown}>;
+    }
+    export function $isKoenigCard(node: LexicalNode): node is KgDefaultNodes.KoenigDecoratorNode;
+
+    export class AsideNode extends ElementNode {}
+    export function $isAsideNode(node: LexicalNode): node is KgDefaultNodes.AsideNode;
+}
diff --git a/packages/kg-lexical-html-renderer/lib/kg-utils.d.ts b/packages/kg-lexical-html-renderer/lib/kg-utils.d.ts
new file mode 100644
index 0000000000..11bde24b05
--- /dev/null
+++ b/packages/kg-lexical-html-renderer/lib/kg-utils.d.ts
@@ -0,0 +1,3 @@
+declare module '@tryghost/kg-utils' {
+    export function slugify (text: string, options?: {ghostVersion?: string, type?: string}): string;
+}
diff --git a/packages/kg-lexical-html-renderer/lib/transformers/element/aside.ts b/packages/kg-lexical-html-renderer/lib/transformers/element/aside.ts
index 1a766d91f2..5b73a511ce 100644
--- a/packages/kg-lexical-html-renderer/lib/transformers/element/aside.ts
+++ b/packages/kg-lexical-html-renderer/lib/transformers/element/aside.ts
@@ -1,12 +1,9 @@
-// TODO: update this to an import once we move kg-default-nodes to typescript
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const {$isAsideNode} = require('@tryghost/kg-default-nodes');
-import type {LexicalNode} from 'lexical';
+import {$isAsideNode, RendererOptions} from '@tryghost/kg-default-nodes';
+import type {ElementNode} from 'lexical';
 import type {ExportChildren} from '..';
-import type {RendererOptions} from '../../convert-to-html-string';
 
 module.exports = {
-    export(node: LexicalNode, options: RendererOptions, exportChildren: ExportChildren) {
+    export(node: ElementNode, options: RendererOptions, exportChildren: ExportChildren) {
         if (!$isAsideNode(node)) {
             return null;
         }
diff --git a/packages/kg-lexical-html-renderer/lib/transformers/element/blockquote.ts b/packages/kg-lexical-html-renderer/lib/transformers/element/blockquote.ts
index 6c931a376c..0f5f4f2000 100644
--- a/packages/kg-lexical-html-renderer/lib/transformers/element/blockquote.ts
+++ b/packages/kg-lexical-html-renderer/lib/transformers/element/blockquote.ts
@@ -1,10 +1,10 @@
 import {$isQuoteNode} from '@lexical/rich-text';
-import type {LexicalNode} from 'lexical';
+import type {RendererOptions} from '@tryghost/kg-default-nodes';
+import type {ElementNode} from 'lexical';
 import type {ExportChildren} from '..';
-import type {RendererOptions} from '../../convert-to-html-string';
 
 module.exports = {
-    export(node: LexicalNode, options: RendererOptions, exportChildren: ExportChildren) {
+    export(node: ElementNode, options: RendererOptions, exportChildren: ExportChildren) {
         if (!$isQuoteNode(node)) {
             return null;
         }
diff --git a/packages/kg-lexical-html-renderer/lib/transformers/element/heading.ts b/packages/kg-lexical-html-renderer/lib/transformers/element/heading.ts
index 286fecca1c..7c47f8ae2d 100644
--- a/packages/kg-lexical-html-renderer/lib/transformers/element/heading.ts
+++ b/packages/kg-lexical-html-renderer/lib/transformers/element/heading.ts
@@ -1,11 +1,11 @@
 import {$isHeadingNode} from '@lexical/rich-text';
 import generateId from '../../utils/generate-id';
-import type {LexicalNode} from 'lexical';
+import type {RendererOptions} from '@tryghost/kg-default-nodes';
+import type {ElementNode} from 'lexical';
 import type {ExportChildren} from '..';
-import type {RendererOptions} from '../../convert-to-html-string';
 
 module.exports = {
-    export(node: LexicalNode, options: RendererOptions, exportChildren: ExportChildren) {
+    export(node: ElementNode, options: RendererOptions, exportChildren: ExportChildren) {
         if (!$isHeadingNode(node)) {
             return null;
         }
diff --git a/packages/kg-lexical-html-renderer/lib/transformers/element/list.ts b/packages/kg-lexical-html-renderer/lib/transformers/element/list.ts
index 7a165eb4db..01d4235739 100644
--- a/packages/kg-lexical-html-renderer/lib/transformers/element/list.ts
+++ b/packages/kg-lexical-html-renderer/lib/transformers/element/list.ts
@@ -1,9 +1,10 @@
 import {$isListNode, $isListItemNode} from '@lexical/list';
-import type {LexicalNode} from 'lexical';
+import type {ElementNode} from 'lexical';
+import type {ListNode} from '@lexical/list';
+import type {RendererOptions} from '@tryghost/kg-default-nodes';
 import type {ExportChildren} from '..';
-import type {RendererOptions} from '../../convert-to-html-string';
 
-const exportList = function (node: LexicalNode, options: RendererOptions, exportChildren: ExportChildren): string | null {
+const exportList = function (node: ElementNode, options: RendererOptions, exportChildren: ExportChildren): string | null {
     if (!$isListNode(node)) {
         return null;
     }
@@ -20,7 +21,7 @@ const exportList = function (node: LexicalNode, options: RendererOptions, export
     // </li>
     let liOpen = false;
 
-    const exportListContent = (listNode: LexicalNode): string => {
+    const exportListContent = (listNode: ListNode): string => {
         const output = [];
         const children = listNode.getChildren();
 
@@ -66,7 +67,7 @@ const exportList = function (node: LexicalNode, options: RendererOptions, export
 };
 
 module.exports = {
-    export(node: LexicalNode, options: RendererOptions, exportChildren: ExportChildren) {
+    export(node: ElementNode, options: RendererOptions, exportChildren: ExportChildren) {
         return exportList(node, options, exportChildren);
     }
 };
diff --git a/packages/kg-lexical-html-renderer/lib/transformers/element/paragraph.ts b/packages/kg-lexical-html-renderer/lib/transformers/element/paragraph.ts
index b0f33348d8..aad1374a55 100644
--- a/packages/kg-lexical-html-renderer/lib/transformers/element/paragraph.ts
+++ b/packages/kg-lexical-html-renderer/lib/transformers/element/paragraph.ts
@@ -1,10 +1,10 @@
 import {$isParagraphNode} from 'lexical';
-import type {LexicalNode} from 'lexical';
+import type {ElementNode} from 'lexical';
 import type {ExportChildren} from '..';
-import type {RendererOptions} from '../../convert-to-html-string';
+import type {RendererOptions} from '@tryghost/kg-default-nodes';
 
 module.exports = {
-    export(node: LexicalNode, options: RendererOptions, exportChildren: ExportChildren) {
+    export(node: ElementNode, options: RendererOptions, exportChildren: ExportChildren) {
         if (!$isParagraphNode(node)) {
             return null;
         }
diff --git a/packages/kg-lexical-html-renderer/lib/transformers/index.ts b/packages/kg-lexical-html-renderer/lib/transformers/index.ts
index 49323c236c..d2ef6e2578 100644
--- a/packages/kg-lexical-html-renderer/lib/transformers/index.ts
+++ b/packages/kg-lexical-html-renderer/lib/transformers/index.ts
@@ -1,9 +1,9 @@
-import {LexicalNode} from 'lexical';
-import {RendererOptions} from '../convert-to-html-string';
+import {ElementNode} from 'lexical';
+import type {RendererOptions} from '@tryghost/kg-default-nodes';
 
-export type ExportChildren = (node: LexicalNode, options?: RendererOptions) => string;
+export type ExportChildren = (node: ElementNode, options?: RendererOptions) => string;
 export type ElementTransformer = {
-    export: (node: LexicalNode, options: RendererOptions, exportChildren: ExportChildren) => string | null;
+    export: (node: ElementNode, options: RendererOptions, exportChildren: ExportChildren) => string | null;
 };
 
 const elementTransformers: ElementTransformer[] = [
@@ -14,4 +14,4 @@ const elementTransformers: ElementTransformer[] = [
     require('./element/aside')
 ];
 
-export default elementTransformers;
\ No newline at end of file
+export default elementTransformers;
diff --git a/packages/kg-lexical-html-renderer/lib/utils/TextContent.ts b/packages/kg-lexical-html-renderer/lib/utils/TextContent.ts
index b96bed208d..2ff99ae32c 100644
--- a/packages/kg-lexical-html-renderer/lib/utils/TextContent.ts
+++ b/packages/kg-lexical-html-renderer/lib/utils/TextContent.ts
@@ -1,10 +1,10 @@
-import {$isLinkNode} from '@lexical/link';
-import {$isTextNode, $isLineBreakNode} from 'lexical';
-import type {LexicalNode, TextFormatType} from 'lexical';
-import {RendererOptions} from '../convert-to-html-string';
+import {$isLinkNode, LinkNode} from '@lexical/link';
+import {$isTextNode, $isLineBreakNode, TextNode} from 'lexical';
+import type {ElementNode, LexicalNode, TextFormatType} from 'lexical';
+import type {RendererOptions} from '@tryghost/kg-default-nodes';
 
 type TextFormatAbbreviation = 'STRONG' | 'EM' | 'S' | 'U' | 'CODE' | 'SUB' | 'SUP' | 'MARK';
-type ExportChildren = (node: LexicalNode, options: RendererOptions) => string;
+type ExportChildren = (node: ElementNode, options: RendererOptions) => string;
 
 const FORMAT_TAG_MAP: Record<TextFormatType, TextFormatAbbreviation> = {
     bold: 'STRONG',
@@ -93,14 +93,14 @@ export default class TextContent {
                 const remainingNodes = this.nodes.slice(i + 1);
                 // avoid checking any nodes after a link node because those cause all formats to close
                 const nextLinkNodeIndex = remainingNodes.findIndex(n => $isLinkNode(n));
-                let remainingSortNodes = nextLinkNodeIndex === -1 ? remainingNodes : remainingNodes.slice(0, nextLinkNodeIndex);
+                const remainingSortNodes = nextLinkNodeIndex === -1 ? remainingNodes : remainingNodes.slice(0, nextLinkNodeIndex);
 
                 // ensure we're only working with text nodes as they're the only ones that can open/close formats
-                remainingSortNodes = remainingSortNodes.filter(n => $isTextNode(n));
+                const remainingSortedTextNodes = remainingSortNodes.filter(n => $isTextNode(n)) as TextNode[];
 
                 formatsToOpen.sort((a, b) => {
-                    const aIndex = remainingSortNodes.findIndex(n => n.hasFormat(a));
-                    const bIndex = remainingSortNodes.findIndex(n => n.hasFormat(b));
+                    const aIndex = remainingSortedTextNodes.findIndex(n => n.hasFormat(a));
+                    const bIndex = remainingSortedTextNodes.findIndex(n => n.hasFormat(b));
 
                     if (aIndex === -1) {
                         return 1;
@@ -127,7 +127,7 @@ export default class TextContent {
                 // links are their own formatting islands so all formats need to close before a link
                 const nextNode = remainingNodes.find(n => $isTextNode(n) || $isLinkNode(n));
                 [...openFormats].forEach((format) => {
-                    if (!nextNode || $isLinkNode(nextNode) || !nextNode.hasFormat(format)) {
+                    if (!nextNode || $isLinkNode(nextNode) || (nextNode instanceof TextNode && !nextNode.hasFormat(format))) {
                         currentNode = currentNode.parentNode as HTMLElement;
                         openFormats.pop();
                     }
@@ -150,13 +150,13 @@ export default class TextContent {
 
     // PRIVATE -----------------------------------------------------------------
 
-    _buildAnchorElement(anchor: HTMLElement, node: LexicalNode) {
+    _buildAnchorElement(anchor: HTMLElement, node: LinkNode) {
         // Only set the href if we have a URL, otherwise we get a link to the current page
         if (node.getURL()) {
             anchor.setAttribute('href', node.getURL());
         }
         if (node.getRel()) {
-            anchor.setAttribute('rel', node.getRel());
+            anchor.setAttribute('rel', node.getRel() || '');
         }
         anchor.innerHTML = this.exportChildren(node, this.options);
     }
diff --git a/packages/kg-lexical-html-renderer/lib/utils/generate-id.ts b/packages/kg-lexical-html-renderer/lib/utils/generate-id.ts
index c53b19a93a..bd90c433a2 100644
--- a/packages/kg-lexical-html-renderer/lib/utils/generate-id.ts
+++ b/packages/kg-lexical-html-renderer/lib/utils/generate-id.ts
@@ -1,8 +1,5 @@
-import {RendererOptions} from '../convert-to-html-string';
-
-// TODO: update to import when converted to typescript, for now disable next line
-// eslint-disable-next-line
-const {slugify} = require('@tryghost/kg-utils');
+import type {RendererOptions} from '@tryghost/kg-default-nodes';
+import {slugify} from '@tryghost/kg-utils';
 
 function generateId(text: string, options: RendererOptions) {
     if (!options.usedIdAttributes) {
diff --git a/packages/kg-lexical-html-renderer/package.json b/packages/kg-lexical-html-renderer/package.json
index 976e4a7804..d11d5ab584 100644
--- a/packages/kg-lexical-html-renderer/package.json
+++ b/packages/kg-lexical-html-renderer/package.json
@@ -35,15 +35,15 @@
     "sinon": "17.0.1"
   },
   "dependencies": {
-    "@lexical/clipboard": "0.12.2",
-    "@lexical/code": "0.12.2",
-    "@lexical/headless": "0.12.2",
-    "@lexical/link": "0.12.2",
-    "@lexical/list": "0.12.2",
-    "@lexical/rich-text": "0.12.2",
+    "@lexical/clipboard": "0.13.1",
+    "@lexical/code": "0.13.1",
+    "@lexical/headless": "0.13.1",
+    "@lexical/link": "0.13.1",
+    "@lexical/list": "0.13.1",
+    "@lexical/rich-text": "0.13.1",
     "@tryghost/kg-default-nodes": "^1.0.7",
     "jsdom": "^23.0.0",
-    "lexical": "0.12.2",
+    "lexical": "0.13.1",
     "prettier": "^3.0.0"
   }
 }
diff --git a/packages/koenig-lexical/package.json b/packages/koenig-lexical/package.json
index 33b356070b..b2d09ac2c6 100644
--- a/packages/koenig-lexical/package.json
+++ b/packages/koenig-lexical/package.json
@@ -53,12 +53,12 @@
     "@emoji-mart/data": "^1.1.2",
     "@emoji-mart/react": "^1.1.1",
     "@etchteam/storybook-addon-status": "^4.2.4",
-    "@lexical/clipboard": "0.12.2",
-    "@lexical/list": "0.12.2",
-    "@lexical/react": "0.12.2",
-    "@lexical/selection": "0.12.2",
-    "@lexical/text": "0.12.2",
-    "@lexical/utils": "0.12.2",
+    "@lexical/clipboard": "0.13.1",
+    "@lexical/list": "0.13.1",
+    "@lexical/react": "0.13.1",
+    "@lexical/selection": "0.13.1",
+    "@lexical/text": "0.13.1",
+    "@lexical/utils": "0.13.1",
     "@lezer/highlight": "^1.1.3",
     "@playwright/test": "^1.33.0",
     "@prettier/sync": "^0.3.0",
@@ -104,8 +104,7 @@
     "eventemitter3": "^5.0.0",
     "fast-average-color": "^9.3.0",
     "jsdom": "23.2.0",
-    "lexical": "0.12.2",
-    "lodash": "^4.17.21",
+    "lexical": "0.13.1",
     "luxon": "^3.3.0",
     "pluralize": "^8.0.0",
     "postcss": "8.4.33",
diff --git a/packages/koenig-lexical/src/components/ui/UnsplashPlugin.jsx b/packages/koenig-lexical/src/components/ui/UnsplashPlugin.jsx
index 1baf69002e..e24db76061 100644
--- a/packages/koenig-lexical/src/components/ui/UnsplashPlugin.jsx
+++ b/packages/koenig-lexical/src/components/ui/UnsplashPlugin.jsx
@@ -30,7 +30,7 @@ const UnsplashPlugin = ({nodeKey, isModalOpen = true}) => {
             node.alt = image.alt;
             const editorState = generateEditorState({
                 editor: node.__captionEditor,
-                initialHtml: `<p>${image.caption}</p>`
+                initialHtml: `${image.caption}`
             });
             node.__captionEditor.setEditorState(editorState);
             const nodeSelection = $createNodeSelection();
diff --git a/packages/koenig-lexical/src/components/ui/cards/BookmarkCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/BookmarkCard.stories.jsx
index d8b45e0235..d72b65e684 100644
--- a/packages/koenig-lexical/src/components/ui/cards/BookmarkCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/BookmarkCard.stories.jsx
@@ -38,7 +38,7 @@ export default story;
 
 const Template = ({display, caption, ...args}) => {
     const captionEditor = createEditor({nodes: MINIMAL_NODES});
-    populateEditor({editor: captionEditor, initialHtml: `<p>${caption}</p>`});
+    populateEditor({editor: captionEditor, initialHtml: `${caption}`});
 
     return (
         <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/components/ui/cards/CalloutCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/CalloutCard.stories.jsx
index fc814fc6a6..d65ae146f0 100644
--- a/packages/koenig-lexical/src/components/ui/cards/CalloutCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/CalloutCard.stories.jsx
@@ -39,7 +39,7 @@ export default story;
 
 const Template = ({display, value, ...args}) => {
     const textEditor = createEditor();
-    populateEditor({editor: textEditor, initialHtml: `<p>${value}</p>`});
+    populateEditor({editor: textEditor, initialHtml: `${value}`});
 
     return (
         <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/components/ui/cards/CodeBlockCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/CodeBlockCard.stories.jsx
index 86ac325203..89defc9f6d 100644
--- a/packages/koenig-lexical/src/components/ui/cards/CodeBlockCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/CodeBlockCard.stories.jsx
@@ -40,7 +40,7 @@ export default story;
 
 const Template = ({display, caption, ...args}) => {
     const captionEditor = createEditor({nodes: MINIMAL_NODES});
-    populateEditor({editor: captionEditor, initialHtml: `<p>${caption}</p>`});
+    populateEditor({editor: captionEditor, initialHtml: `${caption}`});
 
     return (
         <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/components/ui/cards/CollectionCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/CollectionCard.stories.jsx
index 9ce3535143..d2156cb177 100644
--- a/packages/koenig-lexical/src/components/ui/cards/CollectionCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/CollectionCard.stories.jsx
@@ -188,7 +188,7 @@ export default story;
 
 const Template = ({display, header = 'Featured posts', ...args}) => {
     const headerEditor = createEditor({nodes: MINIMAL_NODES});
-    populateEditor({editor: headerEditor, initialHtml: `<p>${header}</p>`});
+    populateEditor({editor: headerEditor, initialHtml: `${header}`});
 
     return (
         <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/components/ui/cards/EmailCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/EmailCard.stories.jsx
index d21c34d854..1c8dfccb42 100644
--- a/packages/koenig-lexical/src/components/ui/cards/EmailCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/EmailCard.stories.jsx
@@ -41,7 +41,7 @@ export default story;
 
 const Template = ({display, html, ...args}) => {
     const editor = createEditor({nodes: BASIC_NODES});
-    populateEditor({editor, initialHtml: `<p>${html}</p>`});
+    populateEditor({editor, initialHtml: `${html}`});
 
     return (
         <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/components/ui/cards/EmailCtaCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/EmailCtaCard.stories.jsx
index d0e6f041c3..06393adffc 100644
--- a/packages/koenig-lexical/src/components/ui/cards/EmailCtaCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/EmailCtaCard.stories.jsx
@@ -41,7 +41,7 @@ export default story;
 
 const Template = ({display, value, ...args}) => {
     const htmlEditor = createEditor({nodes: BASIC_NODES});
-    populateEditor({editor: htmlEditor, initialHtml: `<p>${value}</p>`});
+    populateEditor({editor: htmlEditor, initialHtml: `${value}`});
     return (
         <div>
             <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/components/ui/cards/EmbedCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/EmbedCard.stories.jsx
index beb1590377..211d19294e 100644
--- a/packages/koenig-lexical/src/components/ui/cards/EmbedCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/EmbedCard.stories.jsx
@@ -38,7 +38,7 @@ export default story;
 
 const Template = ({display, caption, ...args}) => {
     const captionEditor = createEditor({nodes: MINIMAL_NODES});
-    populateEditor({editor: captionEditor, initialHtml: `<p>${caption}</p>`});
+    populateEditor({editor: captionEditor, initialHtml: `${caption}`});
 
     return (
         <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/components/ui/cards/GalleryCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/GalleryCard.stories.jsx
index 601a5d180b..324d51c7be 100644
--- a/packages/koenig-lexical/src/components/ui/cards/GalleryCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/GalleryCard.stories.jsx
@@ -39,7 +39,7 @@ export default story;
 
 const Template = ({display, caption, ...args}) => {
     const captionEditor = createEditor({nodes: MINIMAL_NODES});
-    populateEditor({editor: captionEditor, initialHtml: `<p>${caption}</p>`});
+    populateEditor({editor: captionEditor, initialHtml: `${caption}`});
 
     return (
         <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/components/ui/cards/HeaderCard/v1/HeaderCard.v1.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/HeaderCard/v1/HeaderCard.v1.stories.jsx
index fc9eb492de..1090ab064d 100644
--- a/packages/koenig-lexical/src/components/ui/cards/HeaderCard/v1/HeaderCard.v1.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/HeaderCard/v1/HeaderCard.v1.stories.jsx
@@ -43,8 +43,8 @@ const Template = ({display, header, subheader, ...args}) => {
     const headerTextEditor = createEditor({nodes: MINIMAL_NODES});
     const subheaderTextEditor = createEditor({nodes: MINIMAL_NODES});
 
-    populateEditor({editor: headerTextEditor, initialHtml: `<p>${header}</p>`});
-    populateEditor({editor: subheaderTextEditor, initialHtml: `<p>${subheader}</p>`});
+    populateEditor({editor: headerTextEditor, initialHtml: `${header}`});
+    populateEditor({editor: subheaderTextEditor, initialHtml: `${subheader}`});
 
     return (<div className="kg-prose">
         <div className="mx-auto my-8 w-full min-w-[initial]">
diff --git a/packages/koenig-lexical/src/components/ui/cards/HeaderCard/v2/HeaderCard.v2.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/HeaderCard/v2/HeaderCard.v2.stories.jsx
index 4b2ae2b9dc..d4bb5d15ab 100644
--- a/packages/koenig-lexical/src/components/ui/cards/HeaderCard/v2/HeaderCard.v2.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/HeaderCard/v2/HeaderCard.v2.stories.jsx
@@ -47,8 +47,8 @@ const Template = ({display, header, subheader, ...args}) => {
     const headerTextEditor = createEditor({nodes: MINIMAL_NODES});
     const subheaderTextEditor = createEditor({nodes: MINIMAL_NODES});
 
-    populateEditor({editor: headerTextEditor, initialHtml: `<p>${header}</p>`});
-    populateEditor({editor: subheaderTextEditor, initialHtml: `<p>${subheader}</p>`});
+    populateEditor({editor: headerTextEditor, initialHtml: `${header}`});
+    populateEditor({editor: subheaderTextEditor, initialHtml: `${subheader}`});
 
     return (<div className="kg-prose">
         <div className="mx-auto my-8 w-full min-w-[initial]">
diff --git a/packages/koenig-lexical/src/components/ui/cards/ImageCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/ImageCard.stories.jsx
index f3b61263ed..bccd470d70 100644
--- a/packages/koenig-lexical/src/components/ui/cards/ImageCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/ImageCard.stories.jsx
@@ -42,7 +42,7 @@ export default story;
 
 const Template = ({display, caption, ...args}) => {
     const captionEditor = createEditor({nodes: MINIMAL_NODES});
-    populateEditor({editor: captionEditor, initialHtml: `<p>${caption}</p>`});
+    populateEditor({editor: captionEditor, initialHtml: `${caption}`});
 
     return (
         <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/components/ui/cards/ProductCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/ProductCard.stories.jsx
index f8297e35a8..03688b4860 100644
--- a/packages/koenig-lexical/src/components/ui/cards/ProductCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/ProductCard.stories.jsx
@@ -40,10 +40,10 @@ export default story;
 
 const Template = ({display, title, description, ...args}) => {
     const titleEditor = createEditor({nodes: MINIMAL_NODES});
-    populateEditor({editor: titleEditor, initialHtml: `<p>${title}</p>`});
+    populateEditor({editor: titleEditor, initialHtml: `${title}`});
 
     const descriptionEditor = createEditor({nodes: BASIC_NODES});
-    populateEditor({editor: descriptionEditor, initialHtml: `<p>${description}</p>`});
+    populateEditor({editor: descriptionEditor, initialHtml: `${description}`});
 
     return (
         <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/components/ui/cards/SignupCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/SignupCard.stories.jsx
index 98ffa7834a..8c0bdafdae 100644
--- a/packages/koenig-lexical/src/components/ui/cards/SignupCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/SignupCard.stories.jsx
@@ -49,9 +49,9 @@ const Template = ({display, heading, subheader, disclaimer, ...args}) => {
     const disclaimerTextEditor = createEditor({nodes: MINIMAL_NODES});
     const cardWidth = args.layout === 'split' ? 'full' : args.layout;
 
-    populateEditor({editor: headerTextEditor, initialHtml: `<p>${heading}</p>`});
-    populateEditor({editor: subheaderTextEditor, initialHtml: `<p>${subheader}</p>`});
-    populateEditor({editor: disclaimerTextEditor, initialHtml: `<p>${disclaimer}</p>`});
+    populateEditor({editor: headerTextEditor, initialHtml: `${heading}`});
+    populateEditor({editor: subheaderTextEditor, initialHtml: `${subheader}`});
+    populateEditor({editor: disclaimerTextEditor, initialHtml: `${disclaimer}`});
 
     return (<div className="kg-prose">
         <div className="mx-auto my-8 min-w-[initial] max-w-[740px]">
diff --git a/packages/koenig-lexical/src/components/ui/cards/ToggleCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/ToggleCard.stories.jsx
index 7ce8fc90c5..5eb2b7c3dd 100644
--- a/packages/koenig-lexical/src/components/ui/cards/ToggleCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/ToggleCard.stories.jsx
@@ -40,10 +40,10 @@ export default story;
 
 const Template = ({display, heading, content, ...args}) => {
     const headingEditor = createEditor({nodes: MINIMAL_NODES});
-    populateEditor({editor: headingEditor, initialHtml: `<p>${heading}</p>`});
+    populateEditor({editor: headingEditor, initialHtml: `${heading}`});
 
     const contentEditor = createEditor({nodes: BASIC_NODES});
-    populateEditor({editor: contentEditor, initialHtml: `<p>${content}</p>`});
+    populateEditor({editor: contentEditor, initialHtml: `${content}`});
 
     return (
         <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/components/ui/cards/VideoCard.stories.jsx b/packages/koenig-lexical/src/components/ui/cards/VideoCard.stories.jsx
index b3da81c3e8..3022429bd6 100644
--- a/packages/koenig-lexical/src/components/ui/cards/VideoCard.stories.jsx
+++ b/packages/koenig-lexical/src/components/ui/cards/VideoCard.stories.jsx
@@ -44,7 +44,7 @@ export default story;
 
 const Template = ({display, caption, ...args}) => {
     const captionEditor = createEditor({nodes: MINIMAL_NODES});
-    populateEditor({editor: captionEditor, initialHtml: `<p>${caption}</p>`});
+    populateEditor({editor: captionEditor, initialHtml: `${caption}`});
 
     return (
         <div className="kg-prose">
diff --git a/packages/koenig-lexical/src/nodes/BookmarkNode.jsx b/packages/koenig-lexical/src/nodes/BookmarkNode.jsx
index 662b88da35..d6387cbfc4 100644
--- a/packages/koenig-lexical/src/nodes/BookmarkNode.jsx
+++ b/packages/koenig-lexical/src/nodes/BookmarkNode.jsx
@@ -40,7 +40,7 @@ export class BookmarkNode extends BaseBookmarkNode {
 
         // populate nested editors on initial construction
         if (!dataset.captionEditor && dataset.caption) {
-            populateNestedEditor(this, '__captionEditor', `<p>${dataset.caption}</p>`); // we serialize with no wrapper
+            populateNestedEditor(this, '__captionEditor', `${dataset.caption}`); // we serialize with no wrapper
         }
     }
 
diff --git a/packages/koenig-lexical/src/nodes/CalloutNode.jsx b/packages/koenig-lexical/src/nodes/CalloutNode.jsx
index 7eef4ca4e3..4bc3fb8963 100644
--- a/packages/koenig-lexical/src/nodes/CalloutNode.jsx
+++ b/packages/koenig-lexical/src/nodes/CalloutNode.jsx
@@ -37,7 +37,7 @@ export class CalloutNode extends BaseCalloutNode {
 
         // populate nested editors on initial construction
         if (!dataset.calloutTextEditor && dataset.calloutText) {
-            populateNestedEditor(this, '__calloutTextEditor', `<p>${dataset.calloutText}</p>`); // we serialize with no wrapper
+            populateNestedEditor(this, '__calloutTextEditor', `${dataset.calloutText}`); // we serialize with no wrapper
         }
     }
 
diff --git a/packages/koenig-lexical/src/nodes/CodeBlockNode.jsx b/packages/koenig-lexical/src/nodes/CodeBlockNode.jsx
index 5a339976e5..affde39ac1 100644
--- a/packages/koenig-lexical/src/nodes/CodeBlockNode.jsx
+++ b/packages/koenig-lexical/src/nodes/CodeBlockNode.jsx
@@ -26,7 +26,7 @@ export class CodeBlockNode extends BaseCodeBlockNode {
 
         // populate nested editors on initial construction
         if (!dataset.captionEditor && dataset.caption) {
-            populateNestedEditor(this, '__captionEditor', `<p>${dataset.caption}</p>`); // we serialize with no wrapper
+            populateNestedEditor(this, '__captionEditor', `${dataset.caption}`); // we serialize with no wrapper
         }
     }
 
diff --git a/packages/koenig-lexical/src/nodes/CollectionNode.jsx b/packages/koenig-lexical/src/nodes/CollectionNode.jsx
index 9ca220442b..e56fe48b8e 100644
--- a/packages/koenig-lexical/src/nodes/CollectionNode.jsx
+++ b/packages/koenig-lexical/src/nodes/CollectionNode.jsx
@@ -35,7 +35,7 @@ export class CollectionNode extends BaseCollectionNode {
         // populate nested editors on initial construction
         const header = dataset.header || this.header; // dataset is not set when inserting a new card
         if (!dataset.headerEditor && header) {
-            populateNestedEditor(this, '__headerEditor', `<p>${header}</p>`);
+            populateNestedEditor(this, '__headerEditor', `${header}`);
         }
     }
 
diff --git a/packages/koenig-lexical/src/nodes/EmbedNode.jsx b/packages/koenig-lexical/src/nodes/EmbedNode.jsx
index 01921a6898..698f12855c 100644
--- a/packages/koenig-lexical/src/nodes/EmbedNode.jsx
+++ b/packages/koenig-lexical/src/nodes/EmbedNode.jsx
@@ -112,7 +112,7 @@ export class EmbedNode extends BaseEmbedNode {
 
         // populate nested editors on initial construction
         if (!dataset.captionEditor && dataset.caption) {
-            populateNestedEditor(this, '__captionEditor', `<p>${dataset.caption}</p>`); // we serialize with no wrapper
+            populateNestedEditor(this, '__captionEditor', `${dataset.caption}`); // we serialize with no wrapper
         }
     }
 
diff --git a/packages/koenig-lexical/src/nodes/GalleryNode.jsx b/packages/koenig-lexical/src/nodes/GalleryNode.jsx
index cf371c780e..5c578aa7fb 100644
--- a/packages/koenig-lexical/src/nodes/GalleryNode.jsx
+++ b/packages/koenig-lexical/src/nodes/GalleryNode.jsx
@@ -47,7 +47,7 @@ export class GalleryNode extends BaseGalleryNode {
         setupNestedEditor(this, '__captionEditor', {editor: dataset.captionEditor, nodes: MINIMAL_NODES});
         // populate nested editors on initial construction
         if (!dataset.captionEditor && caption) {
-            populateNestedEditor(this, '__captionEditor', `<p>${caption}</p>`);
+            populateNestedEditor(this, '__captionEditor', `${caption}`);
         }
     }
 
diff --git a/packages/koenig-lexical/src/nodes/HeaderNode.jsx b/packages/koenig-lexical/src/nodes/HeaderNode.jsx
index 1bd3ba7c05..9396c77c24 100644
--- a/packages/koenig-lexical/src/nodes/HeaderNode.jsx
+++ b/packages/koenig-lexical/src/nodes/HeaderNode.jsx
@@ -63,10 +63,10 @@ export class HeaderNode extends BaseHeaderNode {
 
         // populate nested editors on initial construction
         if (!dataset.headerTextEditor && dataset.header) {
-            populateNestedEditor(this, '__headerTextEditor', `<p>${dataset.header}</p>`); // we serialize with no wrapper
+            populateNestedEditor(this, '__headerTextEditor', `${dataset.header}`); // we serialize with no wrapper
         }
         if (!dataset.subheaderTextEditor && dataset.subheader) {
-            populateNestedEditor(this, '__subheaderTextEditor', `<p>${dataset.subheader}</p>`); // we serialize with no wrapper
+            populateNestedEditor(this, '__subheaderTextEditor', `${dataset.subheader}`); // we serialize with no wrapper
         }
     }
 
diff --git a/packages/koenig-lexical/src/nodes/ImageNode.jsx b/packages/koenig-lexical/src/nodes/ImageNode.jsx
index 08ff7b6deb..4b18f53b7f 100644
--- a/packages/koenig-lexical/src/nodes/ImageNode.jsx
+++ b/packages/koenig-lexical/src/nodes/ImageNode.jsx
@@ -83,7 +83,7 @@ export class ImageNode extends BaseImageNode {
 
         // populate nested editors on initial construction
         if (!dataset.captionEditor && dataset.caption) {
-            populateNestedEditor(this, '__captionEditor', `<p>${dataset.caption}</p>`); // we serialize with no wrapper
+            populateNestedEditor(this, '__captionEditor', `${dataset.caption}`); // we serialize with no wrapper
         }
     }
 
diff --git a/packages/koenig-lexical/src/nodes/ProductNode.jsx b/packages/koenig-lexical/src/nodes/ProductNode.jsx
index 8fbc4f8264..ad56a2013f 100644
--- a/packages/koenig-lexical/src/nodes/ProductNode.jsx
+++ b/packages/koenig-lexical/src/nodes/ProductNode.jsx
@@ -40,7 +40,7 @@ export class ProductNode extends BaseProductNode {
 
         // populate nested editors on initial construction
         if (!dataset.productTitleEditor && dataset.productTitle) {
-            populateNestedEditor(this, '__productTitleEditor', `<p>${dataset.productTitle}</p>`); // we serialize with no wrapper
+            populateNestedEditor(this, '__productTitleEditor', `${dataset.productTitle}`); // we serialize with no wrapper
         }
         if (!dataset.productDescriptionEditor) {
             populateNestedEditor(this, '__productDescriptionEditor', dataset.productDescription);
diff --git a/packages/koenig-lexical/src/nodes/SignupNode.jsx b/packages/koenig-lexical/src/nodes/SignupNode.jsx
index fc3ccc4d6f..7e265d91c0 100644
--- a/packages/koenig-lexical/src/nodes/SignupNode.jsx
+++ b/packages/koenig-lexical/src/nodes/SignupNode.jsx
@@ -51,17 +51,17 @@ export class SignupNode extends BaseSignupNode {
 
         // populate nested editors on initial construction
         if (!dataset.headerTextEditor && dataset.header) {
-            populateNestedEditor(this, '__headerTextEditor', `<p>${dataset.header}</p>`);
+            populateNestedEditor(this, '__headerTextEditor', `${dataset.header}`);
         }
 
         // populate nested editors on initial construction
         if (!dataset.subheaderTextEditor && dataset.subheader) {
-            populateNestedEditor(this, '__subheaderTextEditor', `<p>${dataset.subheader}</p>`);
+            populateNestedEditor(this, '__subheaderTextEditor', `${dataset.subheader}`);
         }
 
         // populate nested editors on initial construction
         if (!dataset.disclaimerTextEditor && dataset.disclaimer) {
-            populateNestedEditor(this, '__disclaimerTextEditor', `<p>${dataset.disclaimer}</p>`);
+            populateNestedEditor(this, '__disclaimerTextEditor', `${dataset.disclaimer}`);
         }
     }
 
diff --git a/packages/koenig-lexical/src/nodes/ToggleNode.jsx b/packages/koenig-lexical/src/nodes/ToggleNode.jsx
index 80f012a6bb..447013b701 100644
--- a/packages/koenig-lexical/src/nodes/ToggleNode.jsx
+++ b/packages/koenig-lexical/src/nodes/ToggleNode.jsx
@@ -39,7 +39,7 @@ export class ToggleNode extends BaseToggleNode {
 
         // populate nested editors on initial construction
         if (!dataset.headingEditor && dataset.heading) {
-            populateNestedEditor(this, '__headingEditor', `<p>${dataset.heading}</p>`);
+            populateNestedEditor(this, '__headingEditor', `${dataset.heading}`);
         }
         if (!dataset.contentEditor && dataset.content) {
             populateNestedEditor(this, '__contentEditor', dataset.content);
diff --git a/packages/koenig-lexical/src/nodes/VideoNode.jsx b/packages/koenig-lexical/src/nodes/VideoNode.jsx
index 48d8a86a7b..e57df73133 100644
--- a/packages/koenig-lexical/src/nodes/VideoNode.jsx
+++ b/packages/koenig-lexical/src/nodes/VideoNode.jsx
@@ -49,7 +49,7 @@ export class VideoNode extends BaseVideoNode {
         setupNestedEditor(this, '__captionEditor', {editor: dataset.captionEditor, nodes: MINIMAL_NODES});
         // populate nested editors on initial construction
         if (!dataset.captionEditor && dataset.caption) {
-            populateNestedEditor(this, '__captionEditor', `<p>${dataset.caption}</p>`);
+            populateNestedEditor(this, '__captionEditor', `${dataset.caption}`);
         }
     }
 
diff --git a/packages/koenig-lexical/src/plugins/HtmlOutputPlugin.jsx b/packages/koenig-lexical/src/plugins/HtmlOutputPlugin.jsx
index 075d8aa1ec..b18fff6996 100644
--- a/packages/koenig-lexical/src/plugins/HtmlOutputPlugin.jsx
+++ b/packages/koenig-lexical/src/plugins/HtmlOutputPlugin.jsx
@@ -25,27 +25,17 @@ export const HtmlOutputPlugin = ({html = '', setHtml}) => {
 
             const nodes = $generateNodesFromDOM(editor, dom);
 
-            let isEmpty = true;
-            nodes.forEach((node) => {
-                // There are few recent issues related to $generateNodesFromDOM
-                // https://github.com/facebook/lexical/issues/2807
-                // https://github.com/facebook/lexical/issues/3677
-                // As a temporary fix, checking node content to remove additional spaces and br
-                if (node.getTextContent().trim()) {
-                    isEmpty = false;
-                }
-            });
+            // There are few recent issues related to $generateNodesFromDOM
+            // https://github.com/facebook/lexical/issues/2807
+            // As a temporary fix, checking node content to remove additional spaces and br
+            const filteredNodes = nodes.filter(n => n.getTextContent().trim());
 
             // Select the root
             $getRoot().select();
-
-            if (isEmpty) {
-                $getRoot().clear();
-                return;
-            }
+            $getRoot().clear();
 
             // Insert them at a selection.
-            $insertNodes(nodes);
+            $insertNodes(filteredNodes);
         });
         // We only do this for init
         // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/packages/koenig-lexical/src/plugins/KoenigBehaviourPlugin.jsx b/packages/koenig-lexical/src/plugins/KoenigBehaviourPlugin.jsx
index e5aa0dd7bf..314fed4c05 100644
--- a/packages/koenig-lexical/src/plugins/KoenigBehaviourPlugin.jsx
+++ b/packages/koenig-lexical/src/plugins/KoenigBehaviourPlugin.jsx
@@ -327,22 +327,22 @@ function useKoenigBehaviour({editor, containerElem, cursorDidExitAtTop, isNested
                     const nextSibling = cardNode.getNextSibling();
 
                     if (direction === 'backward' && previousSibling) {
-                        if (previousSibling.selectEnd) {
-                            previousSibling.selectEnd();
-                        } else if ($isDecoratorNode(previousSibling)) {
+                        if ($isDecoratorNode(previousSibling)) {
                             const nodeSelection = $createNodeSelection();
                             nodeSelection.add(previousSibling.getKey());
                             $setSelection(nodeSelection);
+                        } else if (previousSibling.selectEnd) { // decorator nodes have selectEnd, so this needs to come after that check
+                            previousSibling.selectEnd();
                         } else {
                             cardNode.selectPrevious();
                         }
                     } else if (nextSibling) {
-                        if (nextSibling.selectStart) {
-                            nextSibling.selectStart();
-                        } else if ($isDecoratorNode(nextSibling)) {
+                        if ($isDecoratorNode(nextSibling)) {
                             const nodeSelection = $createNodeSelection();
                             nodeSelection.add(nextSibling.getKey());
                             $setSelection(nodeSelection);
+                        } else if (nextSibling.selectStart) { // decorator nodes have selectStart, so this needs to come after that check
+                            nextSibling.selectStart();
                         } else {
                             cardNode.selectNext();
                         }
@@ -432,7 +432,8 @@ function useKoenigBehaviour({editor, containerElem, cursorDidExitAtTop, isNested
                         event.preventDefault();
                         const cardNode = $getNodeByKey(selectedCardKey);
                         const paragraphNode = $createParagraphNode();
-                        cardNode.getTopLevelElementOrThrow().insertAfter(paragraphNode);
+                        // cardNode.getTopLevelElementOrThrow().insertAfter(paragraphNode);
+                        cardNode.insertAfter(paragraphNode);
                         paragraphNode.select();
                         return true;
                     }
@@ -747,8 +748,14 @@ function useKoenigBehaviour({editor, containerElem, cursorDidExitAtTop, isNested
                     }
 
                     const firstNode = selection.getNodes()[0];
-                    const topLevelElement = firstNode.getTopLevelElement();
-                    const previousSibling = topLevelElement.getPreviousSibling();
+                    let previousSibling;
+
+                    if (!$isKoenigCard(firstNode)) {
+                        const topLevelElement = firstNode.getTopLevelElement();
+                        previousSibling = topLevelElement.getPreviousSibling();
+                    } else {
+                        previousSibling = firstNode.getPreviousSibling();
+                    }
 
                     if ($isDecoratorNode(previousSibling)) {
                         event.preventDefault();
@@ -776,8 +783,14 @@ function useKoenigBehaviour({editor, containerElem, cursorDidExitAtTop, isNested
 
                     const selectedNodes = selection.getNodes();
                     const lastNode = selectedNodes[selectedNodes.length - 1];
-                    const topLevelElement = lastNode.getTopLevelElement();
-                    const nextSibling = topLevelElement.getNextSibling();
+
+                    let nextSibling;
+                    if ($isKoenigCard(lastNode)) {
+                        nextSibling = lastNode.getNextSibling();
+                    } else {
+                        const topLevelElement = lastNode.getTopLevelElement();
+                        nextSibling = topLevelElement.getNextSibling();
+                    }
 
                     if ($isDecoratorNode(nextSibling)) {
                         event.preventDefault();
diff --git a/packages/koenig-lexical/src/utils/$insertAndSelectNode.js b/packages/koenig-lexical/src/utils/$insertAndSelectNode.js
index 0871b9c153..50f3bc5672 100644
--- a/packages/koenig-lexical/src/utils/$insertAndSelectNode.js
+++ b/packages/koenig-lexical/src/utils/$insertAndSelectNode.js
@@ -10,7 +10,6 @@ export const $insertAndSelectNode = ({selectedNode, newNode}) => {
     const selectedIsEmpty = selectedNode.getTextContent() === '';
 
     selectedNode
-        .getTopLevelElementOrThrow()
         .insertAfter(newNode);
 
     if (selectedIsParagraph && selectedIsEmpty) {
@@ -24,6 +23,6 @@ export const $insertAndSelectNode = ({selectedNode, newNode}) => {
     // always follow the inserted card with a blank paragraph when inserting at end of document
     if (!newNode.getNextSibling()) {
         const paragraph = $createParagraphNode();
-        newNode.getTopLevelElementOrThrow().insertAfter(paragraph);
+        newNode.insertAfter(paragraph);
     }
 };
diff --git a/packages/koenig-lexical/src/utils/generateEditorState.js b/packages/koenig-lexical/src/utils/generateEditorState.js
index 363f66901d..e1f8a8ea3f 100644
--- a/packages/koenig-lexical/src/utils/generateEditorState.js
+++ b/packages/koenig-lexical/src/utils/generateEditorState.js
@@ -8,7 +8,6 @@ export default function generateEditorState({editor, initialHtml}) {
         editor.update(() => {
             const parser = new DOMParser();
             const dom = parser.parseFromString(initialHtml, 'text/html');
-
             const nodes = $generateNodesFromDOM(editor, dom);
 
             // There are few recent issues related to $generateNodesFromDOM
@@ -19,10 +18,8 @@ export default function generateEditorState({editor, initialHtml}) {
 
             // Select the root
             $getRoot().select();
-
-            if (filteredNodes.length === 0) {
-                $getRoot().clear();
-            }
+            // Clear existing content (we initialize an editor with an empty p node so it is focusable if there's no content)
+            $getRoot().clear();
 
             // Insert them at a selection.
             $insertNodes(filteredNodes);
diff --git a/packages/koenig-lexical/src/utils/nested-editors.js b/packages/koenig-lexical/src/utils/nested-editors.js
index 9ee72610de..a90935d3c5 100644
--- a/packages/koenig-lexical/src/utils/nested-editors.js
+++ b/packages/koenig-lexical/src/utils/nested-editors.js
@@ -44,6 +44,7 @@ export function populateNestedEditor(node, editorProperty, html) {
         editor: nestedEditor,
         initialHtml: html
     });
+    
     nestedEditor.setEditorState(editorState, {tag: 'history-merge'}); // use history merge to prevent undo clearing the initial state
 
     // store the initial state separately as it's passed in to `<CollaborationPlugin />`
diff --git a/packages/koenig-lexical/test/e2e/plugins/EmojiPickerPlugin.test.js b/packages/koenig-lexical/test/e2e/plugins/EmojiPickerPlugin.test.js
index f13c8b2702..c0dd671d7e 100644
--- a/packages/koenig-lexical/test/e2e/plugins/EmojiPickerPlugin.test.js
+++ b/packages/koenig-lexical/test/e2e/plugins/EmojiPickerPlugin.test.js
@@ -127,11 +127,11 @@ test.describe('Emoji Picker Plugin', async function () {
     test('emojis retain text formatting on menu insert', async function () {
         await focusEditor(page);
         await page.keyboard.press('Control+Alt+H');
-        await page.keyboard.type('Test :heart', {delay: 10});
+        await page.keyboard.type('Test :taco', {delay: 10});
         await expect(page.getByTestId('emoji-menu')).toBeVisible();
         await page.keyboard.press('Enter');
 
-        await assertHTML(page, '<p dir="ltr"><mark data-lexical-text="true"><span>Test ❤️</span></mark></p>');
+        await assertHTML(page, '<p dir="ltr"><mark data-lexical-text="true"><span>Test 🌮</span></mark></p>');
     });
 
     test('emojis retain text formatting on : completion', async function () {
diff --git a/yarn.lock b/yarn.lock
index fa97176d34..939cf23806 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2257,164 +2257,165 @@
     yargs "17.7.2"
     yargs-parser "21.1.1"
 
-"@lexical/clipboard@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/clipboard/-/clipboard-0.12.2.tgz#cfa74da178673624ecd835eb9449545885cbefc7"
-  integrity sha512-RldmfZquuJJJCJ5WquCyoJ1/eZ+AnNgdksqvd+G+Yn/GyJl/+O3dnHM0QVaDSPvh/PynLFcCtz/57ySLo2kQxQ==
-  dependencies:
-    "@lexical/html" "0.12.2"
-    "@lexical/list" "0.12.2"
-    "@lexical/selection" "0.12.2"
-    "@lexical/utils" "0.12.2"
-
-"@lexical/code@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/code/-/code-0.12.2.tgz#2484511cb9c3688bb85f477d448444250939986d"
-  integrity sha512-w2JeJdnMUtYnC/Fx78sL3iJBt9Ug8pFSDOcI9ay/BkMQFQV8oqq1iyuLLBBJSG4FAM8b2DXrVdGklRQ+jTfTVw==
-  dependencies:
-    "@lexical/utils" "0.12.2"
+"@lexical/clipboard@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/clipboard/-/clipboard-0.13.1.tgz#ca132306129974ea2c9e51d6a8637f8fcffcdb3d"
+  integrity sha512-gMSbVeqb7S+XAi/EMMlwl+FCurLPugN2jAXcp5k5ZaUd7be8B+iupbYdoKkjt4qBhxmvmfe9k46GoC0QOPl/nw==
+  dependencies:
+    "@lexical/html" "0.13.1"
+    "@lexical/list" "0.13.1"
+    "@lexical/selection" "0.13.1"
+    "@lexical/utils" "0.13.1"
+
+"@lexical/code@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/code/-/code-0.13.1.tgz#e13688390582a4b63a639daff1f16bcb82aa854d"
+  integrity sha512-QK77r3QgEtJy96ahYXNgpve8EY64BQgBSnPDOuqVrLdl92nPzjqzlsko2OZldlrt7gjXcfl9nqfhZ/CAhStfOg==
+  dependencies:
+    "@lexical/utils" "0.13.1"
     prismjs "^1.27.0"
 
-"@lexical/dragon@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/dragon/-/dragon-0.12.2.tgz#0ae209449a7ebe57c078584e28edb1b7354ecf99"
-  integrity sha512-Mt8NLzTOt+VgQtc2DKDbHBwKeRlvKqbLqRIMYUVk60gol+YV7NpVBsP1PAMuYYjrTQLhlckBSC32H1SUHZRavA==
-
-"@lexical/hashtag@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/hashtag/-/hashtag-0.12.2.tgz#d9c0f872b4a662b0393b289fa84515ec2c7cd624"
-  integrity sha512-2vYzIu5Ldf+eYdUrNA2m80c3N3MF3vJ0fIJzpl5QyX8OdViggEWl1bh+lKtw1Ju0H0CUyDIXdDLZ2apW3WDkTA==
-  dependencies:
-    "@lexical/utils" "0.12.2"
-
-"@lexical/headless@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/headless/-/headless-0.12.2.tgz#300d5399d5d45e6f0bdc677c9ccaaf287d372572"
-  integrity sha512-fgAPcNG8z/uL++eplR5u5RZQU62n/aOf/znEnMn0toM73yzZQm3+V9Jx/Q5U/QfFuWVwQddVLZ32DGqMCW1/8w==
-
-"@lexical/history@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/history/-/history-0.12.2.tgz#6870871c8120468a213e47c5b303f5b1dd378cba"
-  integrity sha512-PM/EDjnUyBPMWh1UiYb7T+FLbvTk14HwUWLXvZxn72S6Kj8ExH/PfLbWZWLCFL8RfzvbP407VwfSN8S0bF5H6g==
-  dependencies:
-    "@lexical/utils" "0.12.2"
-
-"@lexical/html@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/html/-/html-0.12.2.tgz#6df09c362688b666da0f474d132d889415dbae8a"
-  integrity sha512-LWUO6OKhDtDZa9X1spHAqzsp+4EF01exis4cz5H9y2sHi7EofogXnRCadZ+fa07NVwPVTZWsStkk5qdSe/NEzg==
-  dependencies:
-    "@lexical/selection" "0.12.2"
-
-"@lexical/link@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/link/-/link-0.12.2.tgz#33bf3ecdd98c2b27b2bdd67a8885649e1f528fc2"
-  integrity sha512-etOIONa7uyRDmwg8GN52kDlf8thD2Zk1LOFLeocHWz1V8fe3i2unGUek5s/rNPkc6ynpPpNsHdN1VEghOLCCmw==
-  dependencies:
-    "@lexical/utils" "0.12.2"
-
-"@lexical/list@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/list/-/list-0.12.2.tgz#7afdd13026f936144ff93d40382f21924e8e6908"
-  integrity sha512-3CyWtYQC+IlK4cK/oiD8Uz1gSXD8UcKGOF2vVsDXkMU06O6zvHNmHZOnVJqA0JVNgZAoR9dMR1fi2xd4iuCAiw==
-  dependencies:
-    "@lexical/utils" "0.12.2"
-
-"@lexical/mark@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/mark/-/mark-0.12.2.tgz#bfcfffc9f74505e5a6160679812b3d6bafea9c78"
-  integrity sha512-ub+37PDfmThsqAWipRTrwqpgE+83ckqJ5C3mKQUBZvhZfVZW1rEUXZnKjFh2Q3eZK6iT7zVgoVJWJS9ZgEEyag==
-  dependencies:
-    "@lexical/utils" "0.12.2"
-
-"@lexical/markdown@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/markdown/-/markdown-0.12.2.tgz#b11559590e8684525d4a11d2d78108c3498896b9"
-  integrity sha512-F2jTFtBp7Q+yoA11BeUOEcxhROzW+HUhUGdsn20pSLhuxsWRj3oUuryWFeNKFofpzTCVoqU6dwpaMNMI2mL/sQ==
-  dependencies:
-    "@lexical/code" "0.12.2"
-    "@lexical/link" "0.12.2"
-    "@lexical/list" "0.12.2"
-    "@lexical/rich-text" "0.12.2"
-    "@lexical/text" "0.12.2"
-    "@lexical/utils" "0.12.2"
-
-"@lexical/offset@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/offset/-/offset-0.12.2.tgz#9e4a36508790de1d643d4328986c5c3a2d847de0"
-  integrity sha512-rZLZXfOBmpmM8A2UZsX3cr/CQYw5F/ou67AbaKI0WImb5sjnIgICZqzu9VFUnkKlVNUurEpplV3UG3D1YYh1OQ==
-
-"@lexical/overflow@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/overflow/-/overflow-0.12.2.tgz#b21ba828d6f02e99456d05df6c1d2771fb82aceb"
-  integrity sha512-UgE5j3ukO6qRFRpH4T7m/DvnodE9nCtImD7QinyGdsTa0hi5xlRnl0FUo605vH+vz7xEsUNAGwQXYPX9Sc/vig==
-
-"@lexical/plain-text@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/plain-text/-/plain-text-0.12.2.tgz#87c51de239190d9202122a62aeaae04cb2477cda"
-  integrity sha512-Lcg6+ngRnX70//kz34azYhID3bvW66HSHCfu5UPhCXT+vQ/Jkd/InhRKajBwWXpaJxMM1huoi3sjzVDb3luNtw==
-
-"@lexical/react@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/react/-/react-0.12.2.tgz#336805af7a3d8e69d5b0ef3d0efd7bd4cd8f29fb"
-  integrity sha512-ZBUvf5xmhiYWBw8pPrhYmLAEwFWrbF/cd15y76TUKD9l/2zDwwPs6nJQxBzfz3ei65r2/nnavLDV8W3QfvxfUA==
-  dependencies:
-    "@lexical/clipboard" "0.12.2"
-    "@lexical/code" "0.12.2"
-    "@lexical/dragon" "0.12.2"
-    "@lexical/hashtag" "0.12.2"
-    "@lexical/history" "0.12.2"
-    "@lexical/link" "0.12.2"
-    "@lexical/list" "0.12.2"
-    "@lexical/mark" "0.12.2"
-    "@lexical/markdown" "0.12.2"
-    "@lexical/overflow" "0.12.2"
-    "@lexical/plain-text" "0.12.2"
-    "@lexical/rich-text" "0.12.2"
-    "@lexical/selection" "0.12.2"
-    "@lexical/table" "0.12.2"
-    "@lexical/text" "0.12.2"
-    "@lexical/utils" "0.12.2"
-    "@lexical/yjs" "0.12.2"
+"@lexical/dragon@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/dragon/-/dragon-0.13.1.tgz#32ba02bff4d8f02a6317d874671ee0b0a2dcdc53"
+  integrity sha512-aNlqfif4//jW7gOxbBgdrbDovU6m3EwQrUw+Y/vqRkY+sWmloyAUeNwCPH1QP3Q5cvfolzOeN5igfBljsFr+1g==
+
+"@lexical/hashtag@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/hashtag/-/hashtag-0.13.1.tgz#eb273c199a0115ec0f0191c2449e97f512360f2e"
+  integrity sha512-Dl0dUG4ZXNjYYuAUR0GMGpLGsA+cps2/ln3xEmy28bZR0sKkjXugsu2QOIxZjYIPBewDrXzPcvK8md45cMYoSg==
+  dependencies:
+    "@lexical/utils" "0.13.1"
+
+"@lexical/headless@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/headless/-/headless-0.13.1.tgz#61e475495de49a4c5732e383e1d5f75fc5e39664"
+  integrity sha512-W2mLUuWPrsyf2n73NWM8nKiBI11lEpVVzKE0OzMsjTskv5+AAMaeu1wQ7M1508vKdCcUZwA6AOh3To/hstLEpw==
+
+"@lexical/history@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/history/-/history-0.13.1.tgz#3bb54716dc69779d3b35894bd72637a7fc2ed284"
+  integrity sha512-cZXt30MalEEiRaflE9tHeGYnwT1xSDjXLsf9M409DSU9POJyZ1fsULJrG1tWv2uFQOhwal33rve9+MatUlITrg==
+  dependencies:
+    "@lexical/utils" "0.13.1"
+
+"@lexical/html@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/html/-/html-0.13.1.tgz#e56035d0c6528ffb932390e0d3d357c82f69253a"
+  integrity sha512-XkZrnCSHIUavtpMol6aG8YsJ5KqC9hMxEhAENf3HTGi3ocysCByyXOyt1EhEYpjJvgDG4wRqt25xGDbLjj1/sA==
+  dependencies:
+    "@lexical/selection" "0.13.1"
+    "@lexical/utils" "0.13.1"
+
+"@lexical/link@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/link/-/link-0.13.1.tgz#f1c4c12c828c0251e5d7fb4fb336f2d62380fc57"
+  integrity sha512-7E3B2juL2UoMj2n+CiyFZ7tlpsdViAoIE7MpegXwfe/VQ66wFwk/VxGTa/69ng2EoF7E0kh+SldvGQDrWAWb1g==
+  dependencies:
+    "@lexical/utils" "0.13.1"
+
+"@lexical/list@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/list/-/list-0.13.1.tgz#461cb989157bdf4a43eaa8596fdb09df60d114ee"
+  integrity sha512-6U1pmNZcKLuOWiWRML8Raf9zSEuUCMlsOye82niyF6I0rpPgYo5UFghAAbGISDsyqzM1B2L4BgJ6XrCk/dJptg==
+  dependencies:
+    "@lexical/utils" "0.13.1"
+
+"@lexical/mark@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/mark/-/mark-0.13.1.tgz#084bb49a8bc1c5c5a4ed5c5d4a20c98ea85ec8b1"
+  integrity sha512-dW27PW8wWDOKFqXTBUuUfV+umU0KfwvXGkPUAxRJrvwUWk5RKaS48LhgbNlQ5BfT84Q8dSiQzvbaa6T40t9a3A==
+  dependencies:
+    "@lexical/utils" "0.13.1"
+
+"@lexical/markdown@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/markdown/-/markdown-0.13.1.tgz#1fd2efcacff4ce733682a8161a3f3d78dba37503"
+  integrity sha512-6tbdme2h5Zy/M88loVQVH5G0Nt7VMR9UUkyiSaicyBRDOU2OHacaXEp+KSS/XuF+d7TA+v/SzyDq8HS77cO1wA==
+  dependencies:
+    "@lexical/code" "0.13.1"
+    "@lexical/link" "0.13.1"
+    "@lexical/list" "0.13.1"
+    "@lexical/rich-text" "0.13.1"
+    "@lexical/text" "0.13.1"
+    "@lexical/utils" "0.13.1"
+
+"@lexical/offset@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/offset/-/offset-0.13.1.tgz#f37417822aef3dc81580d4abb96e43ba9d547225"
+  integrity sha512-j/RZcztJ7dyTrfA2+C3yXDzWDXV+XmMpD5BYeQCEApaHvlo20PHt1BISk7RcrnQW8PdzGvpKblRWf//c08LS9w==
+
+"@lexical/overflow@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/overflow/-/overflow-0.13.1.tgz#42c036dc3ad3eb929fda5aa0a00a725b74f72669"
+  integrity sha512-Uw34j+qG2UJRCIR+bykfFMduFk7Pc4r/kNt8N1rjxGuGXAsreTVch1iOhu7Ev6tJgkURsduKuaJCAi7iHnKl7g==
+
+"@lexical/plain-text@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/plain-text/-/plain-text-0.13.1.tgz#e7e713029443c30facce27b34836bf604cf92c0f"
+  integrity sha512-4j5KAsMKUvJ8LhVDSS4zczbYXzdfmgYSAVhmqpSnJtud425Nk0TAfpUBLFoivxZB7KMoT1LGWQZvd47IvJPvtA==
+
+"@lexical/react@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/react/-/react-0.13.1.tgz#6c35bf43e24560d2ca3aa2c6ff607ef37de87bac"
+  integrity sha512-Sy6EL230KAb0RZsZf1dZrRrc3+rvCDQWltcd8C/cqBUYlxsLYCW9s4f3RB2werngD/PtLYbBB48SYXNkIALITA==
+  dependencies:
+    "@lexical/clipboard" "0.13.1"
+    "@lexical/code" "0.13.1"
+    "@lexical/dragon" "0.13.1"
+    "@lexical/hashtag" "0.13.1"
+    "@lexical/history" "0.13.1"
+    "@lexical/link" "0.13.1"
+    "@lexical/list" "0.13.1"
+    "@lexical/mark" "0.13.1"
+    "@lexical/markdown" "0.13.1"
+    "@lexical/overflow" "0.13.1"
+    "@lexical/plain-text" "0.13.1"
+    "@lexical/rich-text" "0.13.1"
+    "@lexical/selection" "0.13.1"
+    "@lexical/table" "0.13.1"
+    "@lexical/text" "0.13.1"
+    "@lexical/utils" "0.13.1"
+    "@lexical/yjs" "0.13.1"
     react-error-boundary "^3.1.4"
 
-"@lexical/rich-text@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/rich-text/-/rich-text-0.12.2.tgz#9ef44e54777fc222ac8df344adb0d7428c784b25"
-  integrity sha512-igsEuv7CwBOAj5c8jeE41cnx6zkhI/Bkbu4W7shT6S6lNA/3cnyZpAMlgixwyK5RoqjGRCT+IJK5l6yBxQfNkw==
+"@lexical/rich-text@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/rich-text/-/rich-text-0.13.1.tgz#8251e81a3985a4d76bef027cf6c0dc90c661e4ec"
+  integrity sha512-HliB9Ync06mv9DBg/5j0lIsTJp+exLHlaLJe+n8Zq1QNTzZzu2LsIT/Crquk50In7K/cjtlaQ/d5RB0LkjMHYg==
 
-"@lexical/selection@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/selection/-/selection-0.12.2.tgz#87e30b953b02923d1691f61d5189eb1be81a19ae"
-  integrity sha512-h+g3oOnihHKIyLTyG6uLCEVR/DmUEVdCcZO1iAoGsuW7nwWiWNPWj6oZ3Cw5J1Mk5u62DHnkkVDQsVSZbAwmtg==
+"@lexical/selection@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/selection/-/selection-0.13.1.tgz#466d7cd0ee1b04680bd949112f1f5cb6a6618efa"
+  integrity sha512-Kt9eSwjxPznj7yzIYipu9yYEgmRJhHiq3DNxHRxInYcZJWWNNHum2xKyxwwcN8QYBBzgfPegfM/geqQEJSV1lQ==
 
-"@lexical/table@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/table/-/table-0.12.2.tgz#59be2fd0413a9125017bb119aa950050bf92717b"
-  integrity sha512-tiAmTq6RKHDVER9v589Ajm9/RL+WTF1WschrH6HHVCtil6cfJfTJeJ+MF45+XEzB9fkqy2LfrScAfWxqLjVePA==
+"@lexical/table@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/table/-/table-0.13.1.tgz#814d3b8a2afb821aff151c92cce831809f9d67a1"
+  integrity sha512-VQzgkfkEmnvn6C64O/kvl0HI3bFoBh3WA/U67ALw+DS11Mb5CKjbt0Gzm/258/reIxNMpshjjicpWMv9Miwauw==
   dependencies:
-    "@lexical/utils" "0.12.2"
+    "@lexical/utils" "0.13.1"
 
-"@lexical/text@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/text/-/text-0.12.2.tgz#623f8a9a56606e202febf4af80cfb5cf2da2a530"
-  integrity sha512-HyuIGuQvVi5djJKKBf+jYEBjK+0Eo9cKHf6WS7dlFozuCZvcCQEJkFy2yceWOwIVk+f2kptVQ5uO7aiZHExH2A==
+"@lexical/text@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/text/-/text-0.13.1.tgz#12104d42da7a707a19853679f3a88e8ed6ce8084"
+  integrity sha512-NYy3TZKt3qzReDwN2Rr5RxyFlg84JjXP2JQGMrXSSN7wYe73ysQIU6PqdVrz4iZkP+w34F3pl55dJ24ei3An9w==
 
-"@lexical/utils@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/utils/-/utils-0.12.2.tgz#b8325f1a1a0d043fd2b40d59cd00c4d7c038474b"
-  integrity sha512-xW4y4l2Yd37+qLwkBvBGyzsKCA9wnh1ljphBJeR2vreT193i2gaIwuku2ZKlER14VHw4192qNJF7vUoAEmwurQ==
+"@lexical/utils@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/utils/-/utils-0.13.1.tgz#f2a72f71c859933781294830b38b25b5b33122a9"
+  integrity sha512-AtQQKzYymkbOaQxaBXjRBS8IPxF9zWQnqwHTUTrJqJ4hX71aIQd/thqZbfQETAFJfC8pNBZw5zpxN6yPHk23dQ==
   dependencies:
-    "@lexical/list" "0.12.2"
-    "@lexical/selection" "0.12.2"
-    "@lexical/table" "0.12.2"
+    "@lexical/list" "0.13.1"
+    "@lexical/selection" "0.13.1"
+    "@lexical/table" "0.13.1"
 
-"@lexical/yjs@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/yjs/-/yjs-0.12.2.tgz#c0bebe1795ecb7e68d88d255dcbfcaa02740539d"
-  integrity sha512-OPJhkJD1Mp9W80mfLzASTB3OFWFMzJteUYA+eSyDgiX9zNi1VGxAqmIITTkDvnCMa+qvw4EfhGeGezpjx6Og4A==
+"@lexical/yjs@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/yjs/-/yjs-0.13.1.tgz#2a71ae3c4b3cc5c660bbe66d537eb0cbf3c7c1b6"
+  integrity sha512-4GbqQM+PwNTV59AZoNrfTe/0rLjs+cX6Y6yAdZSRPBwr5L3JzYeU1TTcFCVQTtsE7KF8ddVP8sD7w9pi8rOWLA==
   dependencies:
-    "@lexical/offset" "0.12.2"
+    "@lexical/offset" "0.13.1"
 
 "@lezer/common@^1.0.0", "@lezer/common@^1.0.2", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0":
   version "1.2.0"
@@ -13141,10 +13142,10 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-lexical@0.12.2:
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/lexical/-/lexical-0.12.2.tgz#68535e145715d5788374495c9ee0420e417d792b"
-  integrity sha512-Kxavd+ETjxtVwG/hvPd6WZfXD44sLOKe9Vlkwxy7lBQ1qZArS+rZfs+u5iXwXe6tX9f2PIM0u3RHsrCEDDE0fw==
+lexical@0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/lexical/-/lexical-0.13.1.tgz#0abffe9bc05a7a9da8a6128ea478bf08c11654db"
+  integrity sha512-jaqRYzVEfBKbX4FwYpd/g+MyOjRaraAel0iQsTrwvx3hyN0bswUZuzb6H6nGlFSjcdrc77wKpyKwoWj4aUd+Bw==
 
 lib0@^0.2.31, lib0@^0.2.52, lib0@^0.2.85, lib0@^0.2.86:
   version "0.2.88"

From 7c7fe06473770792918452004b8f401599cc1b19 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Tue, 6 Feb 2024 15:53:43 -0600
Subject: [PATCH 29/33] Published new versions

 - @tryghost/kg-default-nodes@1.0.8
 - @tryghost/kg-default-transforms@1.0.9
 - @tryghost/kg-html-to-lexical@1.0.9
 - @tryghost/kg-lexical-html-renderer@1.0.8
 - @tryghost/koenig-lexical@1.0.15
---
 packages/kg-default-nodes/package.json         | 2 +-
 packages/kg-default-transforms/package.json    | 4 ++--
 packages/kg-html-to-lexical/package.json       | 6 +++---
 packages/kg-lexical-html-renderer/package.json | 4 ++--
 packages/koenig-lexical/package.json           | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/kg-default-nodes/package.json b/packages/kg-default-nodes/package.json
index 7d7526da03..b688278ffd 100644
--- a/packages/kg-default-nodes/package.json
+++ b/packages/kg-default-nodes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/kg-default-nodes",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "repository": "https://github.com/TryGhost/Koenig/tree/main/packages/kg-default-nodes",
   "author": "Ghost Foundation",
   "license": "MIT",
diff --git a/packages/kg-default-transforms/package.json b/packages/kg-default-transforms/package.json
index 9c3b68c1ce..e787e5f0b8 100644
--- a/packages/kg-default-transforms/package.json
+++ b/packages/kg-default-transforms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/kg-default-transforms",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "repository": "https://github.com/TryGhost/Koenig/tree/main/packages/kg-default-transforms",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "@lexical/list": "0.13.1",
     "@lexical/rich-text": "0.13.1",
     "@lexical/utils": "0.13.1",
-    "@tryghost/kg-default-nodes": "^1.0.7",
+    "@tryghost/kg-default-nodes": "^1.0.8",
     "lexical": "0.13.1"
   }
 }
diff --git a/packages/kg-html-to-lexical/package.json b/packages/kg-html-to-lexical/package.json
index e609f2d978..e956f69236 100644
--- a/packages/kg-html-to-lexical/package.json
+++ b/packages/kg-html-to-lexical/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/kg-html-to-lexical",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "repository": "https://github.com/TryGhost/Koenig/tree/main/packages/kg-html-to-lexical",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -42,8 +42,8 @@
     "@lexical/link": "0.13.1",
     "@lexical/list": "0.13.1",
     "@lexical/rich-text": "0.13.1",
-    "@tryghost/kg-default-nodes": "^1.0.7",
-    "@tryghost/kg-default-transforms": "^1.0.8",
+    "@tryghost/kg-default-nodes": "^1.0.8",
+    "@tryghost/kg-default-transforms": "^1.0.9",
     "jsdom": "^23.0.0",
     "lexical": "0.13.1"
   }
diff --git a/packages/kg-lexical-html-renderer/package.json b/packages/kg-lexical-html-renderer/package.json
index d11d5ab584..59fed7f2e2 100644
--- a/packages/kg-lexical-html-renderer/package.json
+++ b/packages/kg-lexical-html-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/kg-lexical-html-renderer",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "repository": "https://github.com/TryGhost/Koenig/tree/main/packages/kg-lexical-html-renderer",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -41,7 +41,7 @@
     "@lexical/link": "0.13.1",
     "@lexical/list": "0.13.1",
     "@lexical/rich-text": "0.13.1",
-    "@tryghost/kg-default-nodes": "^1.0.7",
+    "@tryghost/kg-default-nodes": "^1.0.8",
     "jsdom": "^23.0.0",
     "lexical": "0.13.1",
     "prettier": "^3.0.0"
diff --git a/packages/koenig-lexical/package.json b/packages/koenig-lexical/package.json
index b2d09ac2c6..7ad4aa5412 100644
--- a/packages/koenig-lexical/package.json
+++ b/packages/koenig-lexical/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/koenig-lexical",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "repository": "https://github.com/TryGhost/Koenig/tree/master/packages/koenig-lexical",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -77,8 +77,8 @@
     "@tryghost/helpers": "^1.1.81",
     "@tryghost/kg-clean-basic-html": "^4.0.3",
     "@tryghost/kg-converters": "^1.0.1",
-    "@tryghost/kg-default-nodes": "^1.0.7",
-    "@tryghost/kg-default-transforms": "^1.0.8",
+    "@tryghost/kg-default-nodes": "^1.0.8",
+    "@tryghost/kg-default-transforms": "^1.0.9",
     "@tryghost/kg-markdown-html-renderer": "^7.0.2",
     "@tryghost/kg-simplemde": "^3.0.1",
     "@types/react": "18.2.48",

From 381be5854a4b223f5d53a332cc019e799b95601f Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Tue, 6 Feb 2024 09:37:26 -0600
Subject: [PATCH 30/33] tsconfig setup

---
 packages/kg-default-nodes/package.json | 2 +-
 yarn.lock                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kg-default-nodes/package.json b/packages/kg-default-nodes/package.json
index b688278ffd..681e27a41d 100644
--- a/packages/kg-default-nodes/package.json
+++ b/packages/kg-default-nodes/package.json
@@ -43,7 +43,7 @@
     "rollup": "4.9.5",
     "should": "13.2.3",
     "sinon": "17.0.1",
-    "typescript": "^5.2.0"
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "@lexical/clipboard": "0.13.1",
diff --git a/yarn.lock b/yarn.lock
index 939cf23806..8ce30c529f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19044,7 +19044,7 @@ typescript@5.2.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
   integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
-typescript@5.3.3, "typescript@>=3 < 6", typescript@^5.2.0:
+typescript@5.3.3, "typescript@>=3 < 6", typescript@^5.3.3:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==

From badd6179c955df67f8dc6dba171bbc33b932a742 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Tue, 6 Feb 2024 13:09:14 -0600
Subject: [PATCH 31/33] convert some nodes, need to resolve exportDOM

---
 .../lib/nodes/ExtendedHeadingNode.ts            | 17 ++++++++---------
 .../lib/nodes/ExtendedQuoteNode.ts              |  5 ++---
 .../lib/nodes/ExtendedTextNode.ts               |  8 +++-----
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts b/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
index 4598e40bf6..d8a7bd63ae 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedHeadingNode.ts
@@ -1,6 +1,6 @@
 /* eslint-disable ghost/filenames/match-exported-class */
 import {HeadingNode, SerializedHeadingNode} from '@lexical/rich-text';
-import {DOMConversionMap} from 'lexical';
+import {DOMConversion, DOMConversionFn, DOMConversionMap} from 'lexical';
 
 // Since the HeadingNode is foundational to Lexical rich-text, only using a
 // custom HeadingNode is undesirable as it means every package would need to
@@ -29,9 +29,10 @@ export class ExtendedHeadingNode extends HeadingNode {
 
     static importDOM(): DOMConversionMap | null {
         const importers = HeadingNode.importDOM();
+        const originalParagraphImporter = importers?.p as DOMConversionFn;
         return {
             ...importers,
-            p: patchParagraphConversion(importers?.p)
+            p: patchParagraphConversion(originalParagraphImporter)
         };
     }
 
@@ -46,15 +47,13 @@ export class ExtendedHeadingNode extends HeadingNode {
     }
 }
 
-// ignore no explicit any
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function patchParagraphConversion(originalDOMConverter: any) {
-    return (node: Node) => {
-        const p = node as HTMLParagraphElement;
+function patchParagraphConversion(originalDOMConverter: DOMConversionFn): DOMConversion | null {
+    return (node: HTMLElement) => {
         // Original matches Google Docs p node to a null conversion so it's
         // child span is parsed as a heading. Don't prevent that here
-        if (originalDOMConverter) {
-            return originalDOMConverter(p);
+        const original = originalDOMConverter(node);
+        if (original) {
+            return original;
         }
 
         // Word uses paragraphs with role="heading" to represent headings
diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts b/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
index 68c0a58c56..75e39a5daf 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedQuoteNode.ts
@@ -1,6 +1,6 @@
 /* eslint-disable ghost/filenames/match-exported-class */
 import {QuoteNode, SerializedQuoteNode} from '@lexical/rich-text';
-import {$createLineBreakNode, $isParagraphNode, DOMConversion, DOMConversionMap, LexicalNode, NodeKey} from 'lexical';
+import {$createLineBreakNode, $isParagraphNode, DOMConversionMap, NodeKey} from 'lexical';
 
 // Since the QuoteNode is foundational to Lexical rich-text, only using a
 // custom QuoteNode is undesirable as it means every package would need to
@@ -34,8 +34,7 @@ export class ExtendedQuoteNode extends QuoteNode {
     }
 
     static importJSON(serializedNode: SerializedQuoteNode): ExtendedQuoteNode {
-        const json = QuoteNode.importJSON(serializedNode) as ExtendedQuoteNode;
-        return json;
+        return QuoteNode.importJSON(serializedNode);
     }
 
     exportJSON(): SerializedQuoteNode {
diff --git a/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts b/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
index b40a98760a..7a8156a3c1 100644
--- a/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
+++ b/packages/kg-default-nodes/lib/nodes/ExtendedTextNode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable ghost/filenames/match-exported-class */
-import {$isTextNode, DOMConversionFn, DOMConversionMap, NodeKey, SerializedTextNode, TextNode} from 'lexical';
+import {$isTextNode, DOMConversion, DOMConversionFn, DOMConversionMap, LexicalNode, NodeKey, SerializedTextNode, TextNode} from 'lexical';
 
 // Since the TextNode is foundational to all Lexical packages, including the
 // plain text use case. Handling any rich text logic is undesirable. This creates
@@ -57,10 +57,8 @@ export class ExtendedTextNode extends TextNode {
     }
 }
 
-// ignore no implicit any
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function patchConversion(originalDOMConverter: any, convertFn: any): DOMConversionFn {
-    return (node: Node) => {
+function patchConversion(originalDOMConverter: DOMConversion, convertFn: DOMConversionFn) {
+    return (node: HTMLElement) => {
         const original = originalDOMConverter?.(node);
         if (!original) {
             return null;

From 9071ccfdda38b77295a585df83e76474f49d38a8 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 7 Feb 2024 12:02:29 -0600
Subject: [PATCH 32/33] drop to ts 5.2.0 to support ghost ts linter

---
 packages/kg-default-nodes/package.json | 2 +-
 yarn.lock                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kg-default-nodes/package.json b/packages/kg-default-nodes/package.json
index 681e27a41d..b688278ffd 100644
--- a/packages/kg-default-nodes/package.json
+++ b/packages/kg-default-nodes/package.json
@@ -43,7 +43,7 @@
     "rollup": "4.9.5",
     "should": "13.2.3",
     "sinon": "17.0.1",
-    "typescript": "^5.3.3"
+    "typescript": "^5.2.0"
   },
   "dependencies": {
     "@lexical/clipboard": "0.13.1",
diff --git a/yarn.lock b/yarn.lock
index 8ce30c529f..939cf23806 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19044,7 +19044,7 @@ typescript@5.2.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
   integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
-typescript@5.3.3, "typescript@>=3 < 6", typescript@^5.3.3:
+typescript@5.3.3, "typescript@>=3 < 6", typescript@^5.2.0:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==

From dce9f3f6c5d165518b152a6aba0cea06953c567f Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 6 Mar 2024 09:17:27 -0600
Subject: [PATCH 33/33] bump image helpers

---
 ...able-image-widths.js => get-available-image-widths.ts} | 8 +++++++-
 .../lib/utils/{resize-image.js => resize-image.ts}        | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)
 rename packages/kg-default-nodes/lib/utils/{get-available-image-widths.js => get-available-image-widths.ts} (83%)
 rename packages/kg-default-nodes/lib/utils/{resize-image.js => resize-image.ts} (70%)

diff --git a/packages/kg-default-nodes/lib/utils/get-available-image-widths.js b/packages/kg-default-nodes/lib/utils/get-available-image-widths.ts
similarity index 83%
rename from packages/kg-default-nodes/lib/utils/get-available-image-widths.js
rename to packages/kg-default-nodes/lib/utils/get-available-image-widths.ts
index 314c1e3aca..4656c9ccc1 100644
--- a/packages/kg-default-nodes/lib/utils/get-available-image-widths.js
+++ b/packages/kg-default-nodes/lib/utils/get-available-image-widths.ts
@@ -1,4 +1,10 @@
-export const getAvailableImageWidths = function (image, imageSizes) {
+interface ImageSizes {
+    [key: string]: {
+        width: number;
+    };
+}
+
+export const getAvailableImageWidths = function (image: HTMLImageElement, imageSizes: ImageSizes) {
     // get a sorted list of the available responsive widths
     const imageWidths = Object.values(imageSizes)
         .map(({width}) => width)
diff --git a/packages/kg-default-nodes/lib/utils/resize-image.js b/packages/kg-default-nodes/lib/utils/resize-image.ts
similarity index 70%
rename from packages/kg-default-nodes/lib/utils/resize-image.js
rename to packages/kg-default-nodes/lib/utils/resize-image.ts
index eb3b9bd1a5..5c5410f568 100644
--- a/packages/kg-default-nodes/lib/utils/resize-image.js
+++ b/packages/kg-default-nodes/lib/utils/resize-image.ts
@@ -1,4 +1,9 @@
-export const resizeImage = function (image, {width: desiredWidth, height: desiredHeight} = {}) {
+interface ImageProps {
+    width?: number;
+    height?: number;
+}
+
+export const resizeImage = function (image: HTMLImageElement, {width: desiredWidth, height: desiredHeight}: ImageProps = {}) {
     const {width, height} = image;
     const ratio = width / height;