fix(platform-server): align server renderer interface with base renderer (#47868)

crisbeto · pkozlowski-opensource · commit 2908eba59c25 · 2022-10-25T14:51:46.000+02:00
The `ServerRenderer` wasn't aligned with the `Renderer2` interface which meant that it was still referring to the old `debugInfo` parameters. It also wasn't implementing the `preserveContent` argument of `selectRootElement` which can lead to incosistencies between the server and the client. Fixes #47844. PR Close #47868
diff --git a/packages/platform-server/src/server_renderer.ts b/packages/platform-server/src/server_renderer.ts
@@ -69,7 +69,7 @@ class DefaultServerRenderer2 implements Renderer2 {
 
   destroyNode = null;
 
-  createElement(name: string, namespace?: string, debugInfo?: any): any {
+  createElement(name: string, namespace?: string): any {
     if (namespace) {
       const doc = this.document || getDOM().getDefaultDocument();
       return doc.createElementNS(NAMESPACE_URIS[namespace], name);
@@ -78,11 +78,11 @@ class DefaultServerRenderer2 implements Renderer2 {
     return getDOM().createElement(name, this.document);
   }
 
-  createComment(value: string, debugInfo?: any): any {
+  createComment(value: string): any {
     return getDOM().getDefaultDocument().createComment(value);
   }
 
-  createText(value: string, debugInfo?: any): any {
+  createText(value: string): any {
     const doc = getDOM().getDefaultDocument();
     return doc.createTextNode(value);
   }
@@ -105,18 +105,16 @@ class DefaultServerRenderer2 implements Renderer2 {
     }
   }
 
-  selectRootElement(selectorOrNode: string|any, debugInfo?: any): any {
-    let el: any;
-    if (typeof selectorOrNode === 'string') {
-      el = this.document.querySelector(selectorOrNode);
-      if (!el) {
-        throw new Error(`The selector "${selectorOrNode}" did not match any elements`);
-      }
-    } else {
-      el = selectorOrNode;
+  selectRootElement(selectorOrNode: string|any, preserveContent?: boolean): any {
+    const el = typeof selectorOrNode === 'string' ? this.document.querySelector(selectorOrNode) :
+                                                    selectorOrNode;
+    if (!el) {
+      throw new Error(`The selector "${selectorOrNode}" did not match any elements`);
     }
-    while (el.firstChild) {
-      el.removeChild(el.firstChild);
+    if (!preserveContent) {
+      while (el.firstChild) {
+        el.removeChild(el.firstChild);
+      }
     }
     return el;
   }
@@ -271,7 +269,7 @@ class EmulatedEncapsulationServerRenderer2 extends DefaultServerRenderer2 {
   }
 
   override createElement(parent: any, name: string): Element {
-    const el = super.createElement(parent, name, this.document);
+    const el = super.createElement(parent, name);
     super.setAttribute(el, this.contentAttr, '');
     return el;
   }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class DefaultServerRenderer2 implements Renderer2 {`
`69`	`69`
`70`	`70`	`destroyNode = null;`
`71`	`71`
`72`		`- createElement(name: string, namespace?: string, debugInfo?: any): any {`
	`72`	`+ createElement(name: string, namespace?: string): any {`
`73`	`73`	`if (namespace) {`
`74`	`74`	`const doc = this.document \|\| getDOM().getDefaultDocument();`
`75`	`75`	`return doc.createElementNS(NAMESPACE_URIS[namespace], name);`
`@@ -78,11 +78,11 @@ class DefaultServerRenderer2 implements Renderer2 {`
`78`	`78`	`return getDOM().createElement(name, this.document);`
`79`	`79`	`}`
`80`	`80`
`81`		`- createComment(value: string, debugInfo?: any): any {`
	`81`	`+ createComment(value: string): any {`
`82`	`82`	`return getDOM().getDefaultDocument().createComment(value);`
`83`	`83`	`}`
`84`	`84`
`85`		`- createText(value: string, debugInfo?: any): any {`
	`85`	`+ createText(value: string): any {`
`86`	`86`	`const doc = getDOM().getDefaultDocument();`
`87`	`87`	`return doc.createTextNode(value);`
`88`	`88`	`}`
`@@ -105,18 +105,16 @@ class DefaultServerRenderer2 implements Renderer2 {`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`		`- selectRootElement(selectorOrNode: string\|any, debugInfo?: any): any {`
`109`		`- let el: any;`
`110`		`- if (typeof selectorOrNode === 'string') {`
`111`		`- el = this.document.querySelector(selectorOrNode);`
`112`		`- if (!el) {`
`113`		- throw new Error(`The selector "${selectorOrNode}" did not match any elements`);
`114`		`- }`
`115`		`- } else {`
`116`		`- el = selectorOrNode;`
	`108`	`+ selectRootElement(selectorOrNode: string\|any, preserveContent?: boolean): any {`
	`109`	`+ const el = typeof selectorOrNode === 'string' ? this.document.querySelector(selectorOrNode) :`
	`110`	`+ selectorOrNode;`
	`111`	`+ if (!el) {`
	`112`	+ throw new Error(`The selector "${selectorOrNode}" did not match any elements`);
`117`	`113`	`}`
`118`		`- while (el.firstChild) {`
`119`		`- el.removeChild(el.firstChild);`
	`114`	`+ if (!preserveContent) {`
	`115`	`+ while (el.firstChild) {`
	`116`	`+ el.removeChild(el.firstChild);`
	`117`	`+ }`
`120`	`118`	`}`
`121`	`119`	`return el;`
`122`	`120`	`}`
`@@ -271,7 +269,7 @@ class EmulatedEncapsulationServerRenderer2 extends DefaultServerRenderer2 {`
`271`	`269`	`}`
`272`	`270`
`273`	`271`	`override createElement(parent: any, name: string): Element {`
`274`		`- const el = super.createElement(parent, name, this.document);`
	`272`	`+ const el = super.createElement(parent, name);`
`275`	`273`	`super.setAttribute(el, this.contentAttr, '');`
`276`	`274`	`return el;`
`277`	`275`	`}`