server-lib bugfix: need scopingRoot (#1100)

samouri · web-flow · commit 7c541631aba3 · 2021-09-28T18:08:49.000-04:00
* server-lib bugfix: need scopingRoot

* nits
diff --git a/src/test/htmlelement/querySelectorAll.test.ts b/src/test/htmlelement/querySelectorAll.test.ts
@@ -39,6 +39,22 @@ test('test Element.querySelectorAll on id selectors', (t) => {
   t.deepEqual(document.querySelectorAll(`#${DIV_ID}`), [div]);
 });
 
+// TODO: create better solution for parameterizing server tests.
+test.serial('server=true: test Element.querySelectorAll on id selectors', (t) => {
+  process.env.SERVER = 'true';
+  try {
+    const document = createTestingDocument();
+    const testEl = document.createElement('test-el');
+    testEl.setAttribute('id', 'TEST_EL_ID');
+    document.appendChild(testEl);
+
+    const result = document.querySelectorAll('#TEST_EL_ID');
+    t.deepEqual(result, [testEl]);
+  } finally {
+    delete process.env.SERVER;
+  }
+});
+
 test('test Element.querySelectorAll on class selectors', (t) => {
   const { document, div } = t.context;
 
diff --git a/src/worker-thread/dom/Node.ts b/src/worker-thread/dom/Node.ts
@@ -52,11 +52,11 @@ export abstract class Node {
     this.nodeType = nodeType;
     this.nodeName = nodeName;
     this.ownerDocument = ownerDocument || this;
+    this[TransferrableKeys.scopingRoot] = this;
     if (process.env.SERVER) {
       return;
     }
 
-    this[TransferrableKeys.scopingRoot] = this;
     this[TransferrableKeys.index] = overrideIndex ? storeOverrideNodeMapping(this, overrideIndex) : storeNodeMapping(this);
     this[TransferrableKeys.transferredFormat] = [this[TransferrableKeys.index]];
   }

Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,11 @@ export abstract class Node {`
`52`	`52`	`this.nodeType = nodeType;`
`53`	`53`	`this.nodeName = nodeName;`
`54`	`54`	`this.ownerDocument = ownerDocument \|\| this;`
	`55`	`+ this[TransferrableKeys.scopingRoot] = this;`
`55`	`56`	`if (process.env.SERVER) {`
`56`	`57`	`return;`
`57`	`58`	`}`
`58`	`59`
`59`		`- this[TransferrableKeys.scopingRoot] = this;`
`60`	`60`	`this[TransferrableKeys.index] = overrideIndex ? storeOverrideNodeMapping(this, overrideIndex) : storeNodeMapping(this);`
`61`	`61`	`this[TransferrableKeys.transferredFormat] = [this[TransferrableKeys.index]];`
`62`	`62`	`}`