npm - wc-compiler - Versions diffs - 0.20.0 → 0.21.1 - Mend

wc-compiler 0.20.0 → 0.21.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "wc-compiler",
-  "version": "0.20.0",
+  "version": "0.21.1",
   "description": "WCC supports server-rendering of standard Web Components, generating HTML directly from your custom element definitions.",
   "repository": {
     "type": "git",
@@ -17,7 +17,8 @@
     "./register": "./src/register.js",
     "./dom-shim": "./src/dom-shim.js",
     "./jsx-loader": "./src/jsx-loader.js",
-    "./jsx-runtime": "./src/jsx-runtime.ts"
+    "./jsx-runtime": "./src/jsx-runtime.ts",
+    "./effect": "./src/effect.js"
   },
   "author": "Owen Buckley <owen@thegreenhouse.io>",
   "keywords": [
@@ -37,9 +38,9 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "greenwood develop",
-    "build": "NODE_OPTIONS='--import @greenwood/cli/register' greenwood build",
-    "serve": "greenwood serve",
+    "docs:dev": "greenwood develop",
+    "docs:build": "NODE_OPTIONS='--import @greenwood/cli/register' greenwood build",
+    "docs:serve": "greenwood serve",
     "lint": "npm run lint:js && npm run lint:ls && npm run lint:css",
     "lint:js": "eslint",
     "lint:ls": "ls-lint",
@@ -61,6 +62,7 @@
     "acorn-walk": "^8.3.4",
     "astring": "^1.9.0",
     "parse5": "^7.2.1",
+    "signal-polyfill": "^0.2.2",
     "sucrase": "^3.35.0"
   },
   "devDependencies": {
@@ -89,6 +91,7 @@
     "lint-staged": "^16.2.6",
     "mocha": "^9.2.2",
     "open-props": "^1.7.4",
+    "patch-package": "^8.0.1",
     "playwright": "^1.58.2",
     "prettier": "^3.6.2",
     "prism-themes": "^1.9.0",

package/src/dom-shim.js CHANGED Viewed

@@ -149,6 +149,10 @@ class Node extends EventTarget {
       this.childNodes.push(textNode);
     }
   }
+  // minimal shim to support JSX <> Signals compilation and caching DOM references tracked to effects
+  querySelector() {}
+  querySelectorAll() {}
 }
 // https://developer.mozilla.org/en-US/docs/Web/API/Element

package/src/effect.js ADDED Viewed

@@ -0,0 +1,44 @@
+// https://github.com/proposal-signals/signal-polyfill?tab=readme-ov-file#creating-a-simple-effect
+import { Signal } from 'signal-polyfill';
+let needsEnqueue = true;
+const w = new Signal.subtle.Watcher(() => {
+  if (needsEnqueue) {
+    needsEnqueue = false;
+    queueMicrotask(processPending);
+  }
+});
+function processPending() {
+  needsEnqueue = true;
+  for (const s of w.getPending()) {
+    s.get();
+  }
+  w.watch();
+}
+export function effect(callback) {
+  // export effect function as a no-op for SSR environments
+  if (typeof window === 'undefined') {
+    return () => {};
+  }
+  let cleanup;
+  const computed = new Signal.Computed(() => {
+    typeof cleanup === 'function' && cleanup();
+    cleanup = callback();
+  });
+  w.watch(computed);
+  computed.get();
+  return () => {
+    w.unwatch(computed);
+    typeof cleanup === 'function' && cleanup();
+    cleanup = undefined;
+  };
+}

package/src/jsx-loader.js CHANGED Viewed

@@ -6,19 +6,27 @@ import fs from 'fs';
 // ideally we can eventually adopt an ESM compatible version of this plugin
 // https://github.com/acornjs/acorn-jsx/issues/112
 // @ts-ignore
-// but it does have a default export???
+// but it does have a default export?
 import jsx from '@projectevergreen/acorn-jsx-esm';
 import { parse, parseFragment, serialize } from 'parse5';
 import { transform } from 'sucrase';
+// expose global Signal polyfill to SSR environment
+import { Signal } from 'signal-polyfill';
+globalThis.Signal = Signal;
 const jsxRegex = /\.(jsx)$/;
 const tsxRegex = /\.(tsx)$/;
+const acornParseOptions = {
+  ecmaVersion: 'latest',
+  sourceType: 'module',
+};
-// TODO same hack as definitions
+// TODO: same hack as definitions
 // https://github.com/ProjectEvergreen/wcc/discussions/74
 let string;
-// TODO move to a util
+// TODO: move to a util
 // https://github.com/ProjectEvergreen/wcc/discussions/74
 function getParse(html) {
   return html.indexOf('<html>') >= 0 || html.indexOf('<body>') >= 0 || html.indexOf('<head>') >= 0
@@ -66,6 +74,9 @@ function applyDomDepthSubstitutions(tree, currentDepth = 1, hasShadowRoot = fals
         }
       }
+      // TODO: handle text nodes for __this__ references
+      // https://github.com/ProjectEvergreen/wcc/issues/88
       if (node.childNodes && node.childNodes.length > 0) {
         applyDomDepthSubstitutions(node, currentDepth + 1, hasShadowRoot);
       }
@@ -77,7 +88,47 @@ function applyDomDepthSubstitutions(tree, currentDepth = 1, hasShadowRoot = fals
   return tree;
 }
-function parseJsxElement(element, moduleContents = '', inferredObservability = false) {
+// TODO handle if / else statements
+// https://github.com/ProjectEvergreen/wcc/issues/88
+function findThisReferences(context, statement) {
+  const references = [];
+  const isRenderFunctionContext = context === 'render';
+  const { expression, type } = statement;
+  const isConstructorThisAssignment =
+    context === 'constructor' &&
+    type === 'ExpressionStatement' &&
+    expression.type === 'AssignmentExpression' &&
+    expression.left.object.type === 'ThisExpression';
+  if (isConstructorThisAssignment) {
+    // this.name = 'something'; // constructor
+    references.push(expression.left.property.name);
+  } else if (isRenderFunctionContext && type === 'VariableDeclaration') {
+    statement.declarations.forEach((declaration) => {
+      const { init, id } = declaration;
+      if (init.object && init.object.type === 'ThisExpression') {
+        // const { description } = this.todo;
+        references.push(init.property.name);
+      } else if (init.type === 'ThisExpression' && id && id.properties) {
+        // const { id, description } = this;
+        id.properties.forEach((property) => {
+          references.push(property.key.name);
+        });
+      } else {
+        // TODO: we are just blindly tracking anything here?
+        // everything should ideally be mapped to actual this references, to create a strong chain of direct reactivity
+        // instead of tracking any declaration as a derived tracking attr
+        // for convenience here, we push the entire declaration here, instead of the name like for direct this references (see above)
+        references.push(declaration);
+      }
+    });
+  }
+  return references;
+}
+function parseJsxElement(element, moduleContents = '', inferredObservability) {
   try {
     const { type } = element;
@@ -124,25 +175,37 @@ function parseJsxElement(element, moduleContents = '', inferredObservability = f
               if (left.object.type === 'ThisExpression') {
                 if (left.property.type === 'Identifier') {
-                  if (inferredObservability) {
-                    // very naive (fine grained?) reactivity
-                    // string += ` ${name}="__this__.${left.property.name}${expression.operator}${right.raw}; __this__.update(\\'${left.property.name}\\', null, __this__.${left.property.name});"`;
-                    string += ` ${name}="__this__.${left.property.name}${expression.operator}${right.raw}; __this__.setAttribute(\\'${left.property.name}\\', __this__.${left.property.name});"`;
-                  } else {
-                    // implicit reactivity using this.render
-                    string += ` ${name}="__this__.${left.property.name}${expression.operator}${right.raw}; __this__.render();"`;
-                  }
+                  // implicit reactivity using this.render
+                  string += ` ${name}="__this__.${left.property.name}${expression.operator}${right.raw}; __this__.render();"`;
                 }
               }
             }
           }
         } else if (attribute.name.type === 'JSXIdentifier') {
-          // TODO is there any difference between an attribute for an event handler vs a normal attribute?
-          // Can all these be parsed using one function>
           if (attribute.value) {
+            const expression = attribute?.value?.expression;
             if (attribute.value.type === 'Literal') {
               // xxx="yyy" >
               string += ` ${name}="${attribute.value.value}"`;
+            } else if (
+              expression &&
+              inferredObservability &&
+              attribute.value.type === 'JSXExpressionContainer' &&
+              expression?.type === 'CallExpression' &&
+              expression?.callee.type === 'MemberExpression' &&
+              expression?.arguments &&
+              expression?.callee?.property?.name === 'get'
+            ) {
+              // xxx={products.get().length} >
+              const { object, property } = expression.callee;
+              if (object.type === 'MemberExpression' && object?.object.type === 'ThisExpression') {
+                // The count is counter={this.count.get()}
+                string += ` ${name}=$\{${object.property.name}.${property.name}()}`;
+              } else if (object.type === 'Identifier') {
+                // xxx={products.get().length} >
+                string += ` ${name}=$\{${object.name}.${property.name}()}`;
+              }
             } else if (attribute.value.type === 'JSXExpressionContainer') {
               // xxx={allTodos.length} >
               const { value } = attribute;
@@ -166,11 +229,6 @@ function parseJsxElement(element, moduleContents = '', inferredObservability = f
                 default:
                   break;
               }
-              // only apply this when dealing with `this` references
-              if (inferredObservability) {
-                string += ` data-wcc-${expression.name}="${name}" data-wcc-ins="attr"`;
-              }
             }
           } else {
             // xxx >
@@ -197,15 +255,19 @@ function parseJsxElement(element, moduleContents = '', inferredObservability = f
     if (type === 'JSXExpressionContainer') {
       const { type } = element.expression;
-      if (type === 'Identifier') {
+      if (
+        inferredObservability &&
+        type === 'CallExpression' &&
+        element.expression.arguments &&
+        element.expression?.callee?.type === 'MemberExpression' &&
+        element.expression?.callee?.property?.name === 'get'
+      ) {
+        // TODO: handle this references
+        // https://github.com/ProjectEvergreen/wcc/issues/88
+        const { object, property } = element.expression.callee;
+        string += `$\{${object.name}.${property.name}()}`;
+      } else if (type === 'Identifier') {
         // You have {count} TODOs left to complete
-        if (inferredObservability) {
-          const { name } = element.expression;
-          string = `${string.slice(0, string.lastIndexOf('>'))} data-wcc-${name}="\${this.${name}}" data-wcc-ins="text">`;
-        }
-        // TODO be able to remove this extra data attribute
-        // string = `${string.slice(0, string.lastIndexOf('>'))} data-wcc-${name} data-wcc-ins="text">`;
         string += `$\{${element.expression.name}}`;
       } else if (type === 'MemberExpression') {
         const { object } = element.expression.object;
@@ -230,44 +292,67 @@ function parseJsxElement(element, moduleContents = '', inferredObservability = f
   return string;
 }
-// TODO handle if / else statements
-// https://github.com/ProjectEvergreen/wcc/issues/88
-function findThisReferences(context, statement) {
-  const references = [];
-  const isRenderFunctionContext = context === 'render';
-  const { expression, type } = statement;
-  const isConstructorThisAssignment =
-    context === 'constructor' &&
-    type === 'ExpressionStatement' &&
-    expression.type === 'AssignmentExpression' &&
-    expression.left.object.type === 'ThisExpression';
+function generateEffectsForReactiveElements(reactiveElements) {
+  let effectsCount = 0;
+  let contents = '';
-  if (isConstructorThisAssignment) {
-    // this.name = 'something'; // constructor
-    references.push(expression.left.property.name);
-  } else if (isRenderFunctionContext && type === 'VariableDeclaration') {
-    statement.declarations.forEach((declaration) => {
-      const { init, id } = declaration;
+  reactiveElements.forEach((element, idx) => {
+    const { effect, attributes } = element;
-      if (init.object && init.object.type === 'ThisExpression') {
-        // const { description } = this.todo;
-        references.push(init.property.name);
-      } else if (init.type === 'ThisExpression' && id && id.properties) {
-        // const { id, description } = this;
-        id.properties.forEach((property) => {
-          references.push(property.key.name);
-        });
-      } else {
-        // TODO we are just blindly tracking anything here.
-        // everything should ideally be mapped to actual this references, to create a strong chain of direct reactivity
-        // instead of tracking any declaration as a derived tracking attr
-        // for convenience here, we push the entire declaration here, instead of the name like for direct this references (see above)
-        references.push(declaration);
-      }
-    });
-  }
+    if (effect?.expression) {
+      contents += `
+        this.$eff${effectsCount} = effect(() => {
+          this.$el${idx}.textContent = ${effect.expression}
+        });\n
+      `;
-  return references;
+      effectsCount++;
+    }
+    if (attributes.length > 0) {
+      const attributeUpdates = attributes
+        .map((attr) => {
+          return `this.$el${idx}.setAttribute('${attr.name}', this.${attr.value}.get())`;
+        })
+        .join('\n');
+      contents += `
+        this.$eff${effectsCount} = effect(() => {
+          ${attributeUpdates}
+        });\n
+      `;
+      effectsCount++;
+    }
+  });
+  return contents;
+}
+function generateEffectsCleanupForReactiveElements(reactiveElements) {
+  let contents = '';
+  let effectCount = 0;
+  reactiveElements.forEach((element) => {
+    const { effect, attributes } = element;
+    if (effect?.expression) {
+      contents += `
+        this.$eff${effectCount}()\n;
+      `;
+      effectCount++;
+    }
+    if (attributes.length > 0) {
+      contents += `
+        this.$eff${effectCount}();
+      `;
+      effectCount += 1;
+    }
+  });
+  return contents;
 }
 export function parseJsx(moduleURL) {
@@ -281,14 +366,22 @@ export function parseJsx(moduleURL) {
   // however, this requires making parseJsx async, but WCC acorn walking is done sync
   const hasOwnObservedAttributes = undefined;
   let inferredObservability = false;
+  // TODO: "merge" observedAttributes tracking with constructor tracking
   let observedAttributes = [];
-  let tree = acorn.Parser.extend(jsx()).parse(result.code, {
-    ecmaVersion: 'latest',
-    sourceType: 'module',
-  });
+  let constructorMembersSignals = new Map();
+  let reactiveElements = [];
+  let componentName;
+  let hasShadowRoot;
+  let hasDisconnectedCallback;
+  let tree = acorn.Parser.extend(jsx()).parse(result.code, acornParseOptions);
   string = '';
-  // TODO: would be nice to do this one pass, but first we need to know if `inferredObservability` is set first
+  // initial pass to get certain information before running JSX transformations (could we do this in one pass?)
+  // 1. if `inferredObservability` is set
+  // 2. get the name of the component class for `static` references
+  // 3, track observed attributes from `this` references in the template
+  // 4. track if Shadow DOM is being used
+  // 5. track if disconnectedCallback is already defined
   walk.simple(
     tree,
     {
@@ -308,6 +401,84 @@ export function parseJsx(moduleURL) {
           }
         }
       },
+      ExportDefaultDeclaration(node) {
+        const { declaration } = node;
+        if (
+          declaration &&
+          declaration.type === 'ClassDeclaration' &&
+          declaration.id &&
+          declaration.id.name
+        ) {
+          componentName = declaration.id.name;
+        }
+      },
+      ClassDeclaration(node) {
+        // @ts-ignore
+        if (node.superClass.name === 'HTMLElement') {
+          // TODO: (good first issue) find a more AST (visitor) based way to check for this
+          // https://github.com/ProjectEvergreen/wcc/issues/258
+          hasShadowRoot =
+            moduleContents.slice(node.body.start, node.body.end).indexOf('this.attachShadow(') > 0;
+          for (const n1 of node.body.body) {
+            if (n1.type === 'MethodDefinition') {
+              // @ts-ignore
+              const nodeName = n1.key.name;
+              if (nodeName === 'render') {
+                for (const n2 in n1.value.body.body) {
+                  const n = n1.value.body.body[n2];
+                  if (n.type === 'VariableDeclaration') {
+                    observedAttributes = [
+                      ...observedAttributes,
+                      ...findThisReferences('render', n),
+                    ];
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      MethodDefinition(node) {
+        if (node.kind === 'method' && node?.key.name === 'disconnectedCallback') {
+          hasDisconnectedCallback = true;
+        }
+        // @ts-ignore
+        if (
+          node.kind === 'constructor' &&
+          node?.value.type === 'FunctionExpression' &&
+          node.value.body?.type === 'BlockStatement'
+        ) {
+          const root = node.value.body?.body;
+          for (const n of root) {
+            if (
+              n.type === 'ExpressionStatement' &&
+              n.expression?.type === 'AssignmentExpression' &&
+              n.expression?.operator === '=' &&
+              n.expression.left.object.type === 'ThisExpression'
+            ) {
+              const { left, right } = n.expression;
+              if (
+                right.type === 'NewExpression' &&
+                right.callee?.object?.type === 'Identifier' &&
+                right.callee?.object?.name === 'Signal'
+              ) {
+                const name = left.property.name;
+                const isState = right.callee?.property?.name === 'State';
+                const isComputed = right.callee?.property?.name === 'Computed';
+                constructorMembersSignals.set(name, {
+                  isState,
+                  isComputed,
+                });
+              }
+            }
+          }
+        }
+      },
     },
     {
       // https://github.com/acornjs/acorn/issues/829#issuecomment-1172586171
@@ -317,15 +488,201 @@ export function parseJsx(moduleURL) {
     },
   );
+  // we do this first to track reactivity usage before we transform the template and re-write its contents
+  if (inferredObservability && observedAttributes.length > 0 && !hasOwnObservedAttributes) {
+    // this scans for signals usage within the template and builds up a reactive list of templates + effects
+    // (could this be done during the transformation pass instead of having to generate and re-parse the module again?)
+    // TODO: recursive scanning for nested components
+    // https://github.com/ProjectEvergreen/wcc/issues/256
+    walk.simple(
+      tree,
+      {
+        MethodDefinition(node) {
+          if (node.key.name === 'render') {
+            for (const n2 in node.value.body.body) {
+              const n = node.value.body.body[n2];
+              if (n.type === 'ReturnStatement' && n.argument.type === 'JSXElement') {
+                const rootNode = n.argument;
+                const parentTag = rootNode.openingElement.name.name;
+                const children = [];
+                let parentTemplate = '';
+                let parentHasReactiveTemplate;
+                let parentHasReactiveAttributes;
+                let parentSignals = [];
+                for (const child of rootNode.children) {
+                  if (child.type === 'JSXText') {
+                    // TODO: track top level reactivity for text nodes?
+                    // https://github.com/ProjectEvergreen/wcc/issues/256
+                    parentTemplate += child.raw;
+                  } else if (child.type === 'JSXExpressionContainer') {
+                    if (
+                      child.expression?.type === 'CallExpression' &&
+                      child.expression?.callee?.type === 'MemberExpression' &&
+                      child.expression?.callee?.property?.name === 'get'
+                    ) {
+                      const { object } = child.expression.callee || {};
+                      parentTemplate += `$\{${object.name}}`;
+                      parentSignals.push(object.name);
+                      parentHasReactiveTemplate = true;
+                    }
+                    parentHasReactiveAttributes = rootNode.openingElement.attributes.some(
+                      (a) =>
+                        a.value.type === 'JSXExpressionContainer' &&
+                        a.value.expression?.type === 'CallExpression' &&
+                        a.value.expression?.callee?.type === 'MemberExpression' &&
+                        a.value.expression?.callee?.property?.name === 'get',
+                    );
+                  } else if (child.type === 'JSXElement') {
+                    const childTag = child.openingElement.name.name;
+                    // track children for determining correct effect selector
+                    if (!children[childTag]) {
+                      children[childTag] = [];
+                    }
+                    children[childTag].push(childTag);
+                    // TODO: I think we are only checking for State, I think we also need to handle Computeds (by themselves) here as well
+                    // TODO: should we filter the things that call .get() out against actual signals found in the constructor / JSX?
+                    // https://github.com/ProjectEvergreen/wcc/issues/256
+                    const hasReactiveTemplate = child.children.some(
+                      (c) =>
+                        c.type === 'JSXExpressionContainer' &&
+                        c.expression?.type === 'CallExpression' &&
+                        c.expression?.callee?.type === 'MemberExpression' &&
+                        c.expression?.callee?.property?.name === 'get',
+                    );
+                    const hasReactiveAttributes = child.openingElement.attributes.some(
+                      (a) =>
+                        a.value.type === 'JSXExpressionContainer' &&
+                        a.value.expression?.type === 'CallExpression' &&
+                        a.value.expression?.callee?.type === 'MemberExpression' &&
+                        a.value.expression?.callee?.property?.name === 'get',
+                    );
+                    if (hasReactiveTemplate || hasReactiveAttributes) {
+                      reactiveElements.push({
+                        selector: `${parentTag} > ${childTag}:nth-of-type(${children[childTag].length})`,
+                        template: {},
+                        attributes: [],
+                      });
+                    }
+                    if (hasReactiveTemplate) {
+                      const signals = [];
+                      let template = '';
+                      for (const c of child.children) {
+                        if (c.type === 'JSXText') {
+                          template += c.value;
+                        } else if (c.type === 'JSXExpressionContainer') {
+                          // TODO: handle this references?
+                          // https://github.com/ProjectEvergreen/wcc/issues/88
+                          const { object } = c.expression.callee || {};
+                          template += `$\{${object.name}}`;
+                          signals.push(object.name);
+                        }
+                      }
+                      if (template !== '' && signals.length > 0) {
+                        const $$templ = `$$tmpl${reactiveElements.length - 1}`;
+                        const staticTemplate = `static ${$$templ} = (${signals.join(',')}) => \`${template.trim()}\`;`;
+                        // TODO: handle this references?
+                        // https://www.github.com/ProjectEvergreen/wcc/issues/88
+                        const expression = `${componentName}.${$$templ}(${signals.map((s) => `this.${s}.get()`).join(', ')});`;
+                        reactiveElements[reactiveElements.length - 1].effect = {
+                          template: staticTemplate,
+                          expression,
+                        };
+                      }
+                    }
+                    if (hasReactiveAttributes) {
+                      for (const attr of child.openingElement.attributes) {
+                        if (
+                          attr.value.type === 'JSXExpressionContainer' &&
+                          attr.value.expression?.type === 'CallExpression' &&
+                          attr.value.expression?.callee?.type === 'MemberExpression' &&
+                          attr.value.expression?.callee?.property?.name === 'get'
+                        ) {
+                          const isThisExpression =
+                            attr.value.expression?.callee?.object?.object?.type ===
+                            'ThisExpression';
+                          const value = isThisExpression
+                            ? attr.value.expression?.callee?.object?.property.name
+                            : attr.value.expression?.callee?.object.name;
+                          reactiveElements[reactiveElements.length - 1].attributes.push({
+                            name: attr.name.name,
+                            value,
+                          });
+                        }
+                      }
+                    }
+                  }
+                }
+                if (parentHasReactiveTemplate) {
+                  const $$templ = `$$tmpl${reactiveElements.length}`;
+                  const staticTemplate = `static ${$$templ} = (${parentSignals.join(',')}) => \`${parentTemplate.trim()}\`;`;
+                  // TODO: handle this references?
+                  // https://www.github.com/ProjectEvergreen/wcc/issues/88
+                  const expression = `${componentName}.${$$templ}(${parentSignals.map((s) => `this.${s}.get()`).join(', ')});`;
+                  reactiveElements.push({
+                    selector: `${parentTag}:nth-of-type(1)`,
+                    effect: {
+                      template: staticTemplate,
+                      expression,
+                    },
+                    attributes: [],
+                  });
+                  if (parentHasReactiveAttributes) {
+                    for (const attr of rootNode.openingElement.attributes) {
+                      if (
+                        attr.value.type === 'JSXExpressionContainer' &&
+                        attr.value.expression?.type === 'CallExpression' &&
+                        attr.value.expression?.callee?.type === 'MemberExpression' &&
+                        attr.value.expression?.callee?.property?.name === 'get'
+                      ) {
+                        const isThisExpression =
+                          attr.value.expression?.callee?.object?.object?.type === 'ThisExpression';
+                        const value = isThisExpression
+                          ? attr.value.expression?.callee?.object?.property.name
+                          : attr.value.expression?.callee?.object.name;
+                        reactiveElements[reactiveElements.length - 1].attributes.push({
+                          name: attr.name.name,
+                          value,
+                        });
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+      },
+      {
+        // https://github.com/acornjs/acorn/issues/829#issuecomment-1172586171
+        ...walk.base,
+        // @ts-ignore
+        JSXElement: () => {},
+      },
+    );
+  }
+  // apply all JSX transformations
   walk.simple(
     tree,
     {
       ClassDeclaration(node) {
         // @ts-ignore
         if (node.superClass.name === 'HTMLElement') {
-          const hasShadowRoot =
-            moduleContents.slice(node.body.start, node.body.end).indexOf('this.attachShadow(') > 0;
           for (const n1 of node.body.body) {
             if (n1.type === 'MethodDefinition') {
               // @ts-ignore
@@ -334,13 +691,7 @@ export function parseJsx(moduleURL) {
                 for (const n2 in n1.value.body.body) {
                   const n = n1.value.body.body[n2];
-                  if (n.type === 'VariableDeclaration') {
-                    observedAttributes = [
-                      ...observedAttributes,
-                      ...findThisReferences('render', n),
-                    ];
-                    // @ts-ignore
-                  } else if (n.type === 'ReturnStatement' && n.argument.type === 'JSXElement') {
+                  if (n.type === 'ReturnStatement' && n.argument.type === 'JSXElement') {
                     const html = parseJsxElement(n.argument, moduleContents, inferredObservability);
                     const elementTree = getParse(html)(html);
                     const elementRoot = hasShadowRoot ? 'this.shadowRoot' : 'this';
@@ -366,10 +717,7 @@ export function parseJsx(moduleURL) {
                         }
                       `
                       : `${elementRoot}.innerHTML = \`${serializedHtml}\`;`;
-                    const transformed = acorn.parse(renderHandler, {
-                      ecmaVersion: 'latest',
-                      sourceType: 'module',
-                    });
+                    const transformed = acorn.parse(renderHandler, acornParseOptions);
                     // @ts-ignore
                     n1.value.body.body[n2] = transformed;
@@ -389,113 +737,105 @@ export function parseJsx(moduleURL) {
     },
   );
+  // TODO: why does this compilation run twice?  logging here will output the message twice
   if (inferredObservability && observedAttributes.length > 0 && !hasOwnObservedAttributes) {
-    let insertPoint;
-    for (const line of tree.body) {
-      // TODO: test for class MyComponent vs export default class MyComponent
-      // @ts-ignore
-      if (
-        line.type === 'ClassDeclaration' ||
-        (line.declaration && line.declaration.type) === 'ClassDeclaration'
-      ) {
-        // @ts-ignore
-        insertPoint = line.declaration.body.start + 1;
-      }
-    }
+    // here we do the following with all the work we've done so far tracking attributes, signals, effects, etc
+    // 1. setup static template functions and observed attributes that we've tracked so far to inject into the top of the class body
+    // 2. append all effects to the end of the connectedCallback function
+    // 3. setup cache references to all elements used in effects
+    walk.simple(
+      tree,
+      {
+        ClassDeclaration(node) {
+          if (
+            node.id.name === componentName &&
+            node.type === 'ClassDeclaration' &&
+            node.body.type === 'ClassBody'
+          ) {
+            // TODO: do we even need this filter?
+            const trackingAttrs = observedAttributes.filter((attr) => typeof attr === 'string');
+            const disconnectedCallbackContents = hasDisconnectedCallback
+              ? ''
+              : `
+                disconnectedCallback() {
+                  ${generateEffectsCleanupForReactiveElements(reactiveElements)}
+                }
+              `;
+            // TODO: better way to determine value type, e,g. array, number, object, etc for `parseAttribute`?
+            // have to wrap these `static` calls in a class here, otherwise we can't parse them standalone w/ acorn
+            const staticContents = `
+              class Stub {
+                ${reactiveElements.map((el, idx) => `$el${idx};`).join('')}
+                ${reactiveElements
+                  .filter((el) => el.effect?.template)
+                  .map((el) => el.effect.template)
+                  .join('\n')}
+                static get observedAttributes() {
+                  return [${[...trackingAttrs]
+                    .filter((attr) => constructorMembersSignals.get(attr)?.isState)
+                    .map((attr) => `'${attr}'`)
+                    .join()}]
+                }
+                static parseAttribute = (value) => value.charAt(0) === '{' || value.charAt(0) === '['
+                  ? JSON.parse(value)
+                  : value !== '' && !isNaN(+value)
+                    ? parseInt(value, 10)
+                    : value === 'true' || value === 'false'
+                      ? value === 'true' ? true : false
+                      : value;
+                attributeChangedCallback(name, oldValue, newValue) {
+                  this[name].set(${componentName}.parseAttribute(newValue));
+                }
+                ${disconnectedCallbackContents}
+              }
+            `;
-    let newModuleContents = generate(tree);
-    const trackingAttrs = observedAttributes.filter((attr) => typeof attr === 'string');
-    // TODO ideally derivedAttrs would explicitly reference trackingAttrs
-    // and if there are no derivedAttrs, do not include the derivedGetters / derivedSetters code in the compiled output
-    const derivedAttrs = observedAttributes.filter((attr) => typeof attr !== 'string');
-    const derivedGetters = derivedAttrs
-      .map((attr) => {
-        return `
-        get_${attr.id.name}(${trackingAttrs.join(',')}) {
-          return ${moduleContents.slice(attr.init.start, attr.init.end)}
-        }
-      `;
-      })
-      .join('\n');
-    const derivedSetters = derivedAttrs
-      .map((attr) => {
-        const name = attr.id.name;
-        return `
-        const old_${name} = this.get_${name}(oldValue);
-        const new_${name} = this.get_${name}(newValue);
-        this.update('${name}', old_${name}, new_${name});
-      `;
-      })
-      .join('\n');
-    // TODO: better way to determine value type, e,g. array, int, object, etc?
-    // TODO: better way to test for shadowRoot presence when running querySelectorAll
-    newModuleContents = `${newModuleContents.slice(0, insertPoint)}
-      static get observedAttributes() {
-        return [${[...trackingAttrs].map((attr) => `'${attr}'`).join()}]
-      }
+            const staticContentsTree = acorn.parse(staticContents, acornParseOptions);
-      attributeChangedCallback(name, oldValue, newValue) {
-        function getValue(value) {
-          return value.charAt(0) === '{' || value.charAt(0) === '['
-            ? JSON.parse(value)
-            : !isNaN(value)
-              ? parseInt(value, 10)
-              : value === 'true' || value === 'false'
-                ? value === 'true' ? true : false
-                : value;
-        }
-        if (newValue !== oldValue) {
-          switch(name) {
-            ${trackingAttrs
-              .map((attr) => {
-                return `
-                  case '${attr}':
-                    this.${attr} = getValue(newValue);
-                    break;
-                `;
-              })
-              .join('\n')}
+            node.body.body.unshift(...staticContentsTree.body[0].body.body);
           }
-          this.update(name, oldValue, newValue);
-        }
-      }
-      update(name, oldValue, newValue) {
-        const attr = \`data-wcc-\${name}\`;
-        const selector = \`[\${attr}]\`;
-        (this?.shadowRoot || this).querySelectorAll(selector).forEach((el) => {
-          // handle empty strings as a value for the purposes of attribute change detection
-          const needle = oldValue === '' ? '' : oldValue ?? el.getAttribute(attr);
-          switch(el.getAttribute('data-wcc-ins')) {
-            case 'text':
-              el.textContent = el.textContent.replace(needle, newValue);
-              break;
-            case 'attr':
-              if (el.hasAttribute(el.getAttribute(attr))) {
-                el.setAttribute(el.getAttribute(attr), newValue);
-              }
-              break;
+        },
+        MethodDefinition(node) {
+          if (node.key.name === 'connectedCallback') {
+            const root = hasShadowRoot ? 'this.shadowRoot' : 'this';
+            const effectElements = reactiveElements
+              .map((el, idx) => `this.$el${idx} = ${root}.querySelector('${el.selector}');`)
+              .join('\n');
+            const effectContents = generateEffectsForReactiveElements(reactiveElements);
+            const effectElementsTree = acorn.parse(effectElements, acornParseOptions);
+            const effectContentsTree = acorn.parse(effectContents, acornParseOptions);
+            node.value.body.body = [
+              ...node.value.body.body,
+              ...effectElementsTree.body,
+              ...effectContentsTree.body,
+            ];
           }
-        })
-        if ([${[...trackingAttrs].map((attr) => `'${attr}'`).join()}].includes(name)) {
-          ${derivedSetters}
-        }
-      }
+          if (node.key.name === 'disconnectedCallback' && hasDisconnectedCallback) {
+            const effectCleanupContents =
+              generateEffectsCleanupForReactiveElements(reactiveElements);
+            const effectCleanupElementsTree = acorn.parse(effectCleanupContents, acornParseOptions);
-      ${derivedGetters}
+            node.value.body.body = [...node.value.body.body, ...effectCleanupElementsTree.body];
+          }
+        },
+      },
+      {
+        // https://github.com/acornjs/acorn/issues/829#issuecomment-1172586171
+        ...walk.base,
+        // @ts-ignore
+        JSXElement: () => {},
+      },
+    );
-      ${newModuleContents.slice(insertPoint)}
-    `;
+    // inject WCC's effect function
+    const effectImportContents = `import { effect } from 'wc-compiler/effect'`;
+    const effectImportTree = acorn.parse(effectImportContents, acornParseOptions);
-    tree = acorn.Parser.extend(jsx()).parse(newModuleContents, {
-      ecmaVersion: 'latest',
-      sourceType: 'module',
-    });
+    tree.body = [...effectImportTree.body, ...tree.body];
   }
   return tree;