minor fixes. visuals reload better now

Author: michaelgoeke

src/browser/PW_live.js

@@ -256,7 +256,7 @@ async function reload_page() {
 }
 
 async function reload_page_object_model_elements() {
-  //clearPageObjectModelElements();
+  clearPageObjectModelElements();
 
   const globalPageObject = window.PW_pages['global_page.ts'];
   if (globalPageObject !== undefined) await _reload_page_object_model_elements(globalPageObject, 'global_page.ts');
@@ -336,10 +336,10 @@ function clearPageObjectModelElements() {
   if (window.PW_overlays !== undefined) for (const el of window.PW_overlays) config.pageObjectModel.overlay.off(el);
 
   //clean up any rogue elements
-  const pageObjectModelAttributes = ['[data-page-object-model]', '[data-page-object-model-import]', '[data-page-object-model-primary-action]', '[data-page-object-model-secondary-actions]'];
-  document.querySelectorAll(pageObjectModelAttributes.join(', ')).forEach(el => {
+  const pageObjectModelAttributes = ['data-page-object-model', 'data-page-object-model-import', 'data-page-object-model-primary-action', 'data-page-object-model-secondary-actions'];
+  document.querySelectorAll(pageObjectModelAttributes.map(x => `[${x}]`).join(', ')).forEach(el => {
     pageObjectModelAttributes.forEach(attr => el.removeAttribute(attr));
-    config.pageObjectModel.overlay.off(el)
+    config.pageObjectModel.overlay.off(el);
   });
   window.PW_overlays = [];
 }

src/main.ts

@@ -70,8 +70,7 @@ export class ${className} {
             overlay: {
                 color: 'salmon',
                 on: (el: HTMLElement, color: string) => {
-                    if (el.getAttribute('data-background')) return;
-                    el.setAttribute('data-background', el.style.background);
+                    if (el.getAttribute('data-background') == null) el.setAttribute('data-background', el.style.background);
                     el.style.background = color ?? 'salmon';
                 },
                 off: (el: HTMLElement) => el.style.background = el.getAttribute('data-background') ?? '',

src/pageObjectModel.ts

@@ -92,6 +92,7 @@ export module pageObjectModel {
         const resultFilePaths = existingPaths.map(e => e.filePath);
         for(const p of existingPaths) {
             const sourceFile = project.addSourceFileAtPath(p.absolutePath);
+            await sourceFile.refreshFromFileSystem();
 
             const exportedClass = sourceFile.getClasses().find(cls => cls.isExported());
             if (exportedClass === undefined) return [];
@@ -109,18 +110,16 @@ export module pageObjectModel {
                     console.error(err);
                 }
                 })()`));
-            const classInstance = Object.entries(<any>importResult)[0][1] as Function;
+            const classInstance = Object.entries(<any>importResult)[0][1] as any;
 
-            const selectorPropertyValues = _(Object.keys(classInstance).filter(key => _state.config.propertySelectorRegex.test(key))).keyBy(x => x).mapValues(key => (<any>classInstance)[key]).value();
-
             const nestedTypeProps = staticProperties
                 .filter(prop => _state.config.propertyNestedTypeRegex.test(prop.getType().getSymbol()?.getName() ?? ''));
 
             let selectorProperties = staticProperties
                 .filter(prop => _state.config.propertySelectorRegex.test(prop.getName()))
                 .map(prop => {
                     const name = prop.getName();
-                    const selector = selectorPropertyValues[name];
+                    const selector = classInstance[name];
                     const selectorMethodName = _state.config.propertySelectorRegex.exec(name)?.[1];
                     const selectorMethodNode = staticMethods.find(m => m.getName() === selectorMethodName);
                     const selectorMethod = selectorMethodNode