chore: bump playwright to 1.41.1

sand4rt · Feb 17, 2024 · cf0e365 · cf0e365
1 parent 44b0ca5
commit cf0e365
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 109 deletions.
diff --git a/ct-web-lit/package.json b/ct-web-lit/package.json
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "@sand4rt/experimental-ct-web": "workspace:*",
-    "@playwright/test": "^1.41.0",
+    "@playwright/test": "^1.41.1",
     "typescript": "^5.1.3",
     "vite": "^4.4.7"
   }

diff --git a/ct-web/package.json b/ct-web/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@sand4rt/experimental-ct-web": "workspace:*",
-    "@playwright/test": "^1.41.0",
+    "@playwright/test": "^1.41.1",
     "typescript": "^5.1.3",
     "vite": "^4.4.7"
   }

diff --git a/playwright-ct-web/package.json b/playwright-ct-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sand4rt/experimental-ct-web",
-  "version": "1.41.0",
+  "version": "1.41.1",
   "description": "Playwright Component Testing for Web Components",
   "homepage": "https://playwright.dev",
   "repository": {
@@ -43,13 +43,13 @@
     }
   },
   "dependencies": {
-    "@playwright/experimental-ct-core": "^1.41.0"
+    "@playwright/experimental-ct-core": "^1.41.1"
   },
   "devDependencies": {
-    "@playwright/test": "1.41.0"
+    "@playwright/test": "1.41.1"
   },
   "peerDependencies": {
-    "@playwright/test": ">=1.41.0"
+    "@playwright/test": ">=1.41.1"
   },
   "bin": {
     "playwright": "./cli.js"

diff --git a/playwright-ct-web/registerSource.mjs b/playwright-ct-web/registerSource.mjs
@@ -17,59 +17,21 @@
 // @ts-check
 // This file is injected into the registry as text, no dependencies are allowed.
 
-/** @typedef {import('@playwright/experimental-ct-core/types/component').Component} Component */
-/** @typedef {import('@playwright/experimental-ct-core/types/component').JsxComponent} JsxComponent */
 /** @typedef {import('@playwright/experimental-ct-core/types/component').ObjectComponent} ObjectComponent */
 /** @typedef {new (...args: any[]) => HTMLElement} FrameworkComponent */
 
-/** @type {Map<string, () => Promise<FrameworkComponent>>} */
-const __pwLoaderRegistry = new Map();
-/** @type {Map<string, FrameworkComponent>} */
-const __pwRegistry = new Map();
 const __pwListeners = new Map();
 
 /**
- * @param {Record<string, () => Promise<FrameworkComponent>>} components
+ * @param {any} component
+ * @returns {component is ObjectComponent}
  */
-export function pwRegister(components) {
-  for (const [name, value] of Object.entries(components))
-    __pwLoaderRegistry.set(name, value);
-}
-
-/**
- * @param {Component} component
- * @returns {component is JsxComponent | ObjectComponent}
- */
-function isComponent(component) {
-  return !(typeof component !== 'object' || Array.isArray(component));
-}
-
-/**
- * @param {Component} component
- */
-async function __pwResolveComponent(component) {
-  if (!isComponent(component))
-    return
-
-  let componentFactory = __pwLoaderRegistry.get(component.type);
-  if (!componentFactory) {
-    // Lookup by shorthand.
-    for (const [name, value] of __pwLoaderRegistry) {
-      if (component.type.endsWith(`_${name}`)) {
-        componentFactory = value;
-        break;
-      }
-    }
-  }
-
-  if (!componentFactory && component.type[0].toUpperCase() === component.type[0])
-    throw new Error(`Unregistered component: ${component.type}. Following components are registered: ${[...__pwRegistry.keys()]}`);
-
-  if(componentFactory)
-    __pwRegistry.set(component.type, await componentFactory())
-
-  if ('children' in component)
-    await Promise.all(component.children.map(child => __pwResolveComponent(child)))
+function isObjectComponent(component) {
+  return (
+    typeof component === 'object' &&
+    component &&
+    component.__pw_type === 'object-component'
+  );
 }
 
 /**
@@ -95,7 +57,7 @@ function __pwRemoveEvents(webComponent, events = {}) {
  */
 function __pwUpdateEvents(webComponent, events = {}) {
   for (const [key, listener] of Object.entries(events)) {
-    const fn = event => listener(/** @type {CustomEvent} */ (event).detail);
+    const fn = (event) => listener(/** @type {CustomEvent} */ (event).detail);
     webComponent.addEventListener(key, fn);
     __pwListeners.set(key, fn);
   }
@@ -114,11 +76,15 @@ function __pwUpdateSlots(webComponent, slots = {}) {
       slotElements = value.map(__pwCreateSlot);
 
     if (!slotElements)
-      throw new Error(`Invalid slot with name: \`${key}\` supplied to \`mount()\``);
+      throw new Error(
+        `Invalid slot with name: \`${key}\` supplied to \`mount()\``,
+      );
 
     for (const slotElement of slotElements) {
       if (!slotElement)
-        throw new Error(`Invalid slot with name: \`${key}\` supplied to \`mount()\``);
+        throw new Error(
+          `Invalid slot with name: \`${key}\` supplied to \`mount()\``,
+        );
 
       if (key === 'default') {
         webComponent.appendChild(slotElement);
@@ -127,7 +93,7 @@ function __pwUpdateSlots(webComponent, slots = {}) {
 
       if (slotElement.nodeName === '#text') {
         throw new Error(
-          `Invalid slot with name: \`${key}\` supplied to \`mount()\`, expected \`HTMLElement\` but received \`TextNode\`.`
+          `Invalid slot with name: \`${key}\` supplied to \`mount()\`, expected \`HTMLElement\` but received \`TextNode\`.`,
         );
       }
 
@@ -143,60 +109,39 @@ function __pwUpdateSlots(webComponent, slots = {}) {
  */
 function __pwCreateSlot(value) {
   return /** @type {?HTMLElement} */ (
-    document
-      .createRange()
-      .createContextualFragment(value)
-      .firstChild
+    document.createRange().createContextualFragment(value).firstChild
   );
 }
 
-/**
- * @param {Component} component
- */
-function __pwCreateComponent(component) {
-  const Component = __pwRegistry.get(component.type);
-  if (!Component)
-    throw new Error(
-      `Unregistered component: ${
-        component.type
-      }. Following components are registered: ${[...__pwRegistry.keys()]}`
-    );
-
-  const webComponent = new Component();
-  __pwUpdateProps(webComponent, component.options?.props);
-  __pwUpdateSlots(webComponent, component.options?.slots);
-  __pwUpdateEvents(webComponent, component.options?.on);
-  return webComponent;
-}
-
 window.playwrightMount = async (component, rootElement, hooksConfig) => {
-  await __pwResolveComponent(component);
-  if (component.kind !== 'object')
+  if (!isObjectComponent(component))
     throw new Error('JSX mount notation is not supported');
 
-  const webComponent = __pwCreateComponent(component);
-
   for (const hook of window['__pw_hooks_before_mount'] || [])
     await hook({ hooksConfig });
 
+    console.log(component)
+  const webComponent = new component();
+  __pwUpdateProps(webComponent, component.props);
+  __pwUpdateSlots(webComponent, component.slots);
+  __pwUpdateEvents(webComponent, component.on);
   rootElement.appendChild(webComponent);
 
   for (const hook of window['__pw_hooks_after_mount'] || [])
     await hook({ hooksConfig });
 };
 
 window.playwrightUpdate = async (rootElement, component) => {
-  await __pwResolveComponent(component);
-  if (component.kind === 'jsx')
+  if (!isObjectComponent(component))
     throw new Error('JSX mount notation is not supported');
 
   const webComponent = /** @type {?HTMLElement} */ (rootElement.firstChild);
   if (!webComponent) throw new Error('Component was not mounted');
 
-  __pwUpdateProps(webComponent, component.options?.props);
-  __pwUpdateSlots(webComponent, component.options?.slots);
-  __pwRemoveEvents(webComponent, component.options?.on);
-  __pwUpdateEvents(webComponent, component.options?.on);
+  __pwUpdateProps(webComponent, component.props);
+  __pwUpdateSlots(webComponent, component.slots);
+  __pwRemoveEvents(webComponent, component.on);
+  __pwUpdateEvents(webComponent, component.on);
 };
 
 window.playwrightUnmount = async (rootElement) => {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml