fix: skip super.properties in lit

open-wc · Apr 25, 2024 · bf49c38 · bf49c38
1 parent 779f6c0
commit bf49c38
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/packages/analyzer/CHANGELOG.md b/packages/analyzer/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Release 0.9.8
+- Skip `...super.properties` in lit's `static properties`
+
 ## Release 0.9.7
 - Added `scheduleUpdate` to lit's method denylist
 

diff --git a/packages/analyzer/browser/index.js b/packages/analyzer/browser/index.js
@@ -205310,17 +205310,17 @@ function staticPropertiesPlugin() {
           if (isMixin(node)) {
             const { mixinFunction, mixinClass } = extractMixinNodes(node);
             const { name } = handleName({}, mixinFunction);
-            handleStaticProperties(mixinClass, moduleDoc, context, name);
+            handleStaticProperties(mixinClass, moduleDoc, context, name, ts13);
           }
           break;
         case ts13.SyntaxKind.ClassDeclaration:
-          handleStaticProperties(node, moduleDoc, context);
+          handleStaticProperties(node, moduleDoc, context, null, ts13);
           break;
       }
     }
   };
 }
-function handleStaticProperties(classNode, moduleDoc, context, mixinName = null) {
+function handleStaticProperties(classNode, moduleDoc, context, mixinName = null, ts13) {
   let className;
   if (!mixinName) {
     className = classNode?.name?.getText();
@@ -205332,6 +205332,8 @@ function handleStaticProperties(classNode, moduleDoc, context, mixinName = null)
     if (hasStaticKeyword(member) && member.name.text === "properties") {
       const propertiesObject = getPropertiesObject(member);
       propertiesObject?.properties?.forEach((property) => {
+        if (property.kind !== ts13.SyntaxKind.PropertyAssignment)
+          return;
         let classMember = {
           kind: "field",
           name: property?.name?.getText() || "",

diff --git a/packages/analyzer/fixtures/07-plugin-lit/01-basic/package/my-element.js b/packages/analyzer/fixtures/07-plugin-lit/01-basic/package/my-element.js
@@ -8,6 +8,7 @@ import { LitElement, property, customElement } from 'lit-element';
 class MyElement extends LitElement {
   static get properties() {
     return {
+      ...super.properties,
       prop1: { type: String }, // has default "'foo'"
       prop2: { type: Boolean },
       attr: { type: String, attribute: 'my-attr' }, // attr output as 'my-attr'

diff --git a/packages/analyzer/package.json b/packages/analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@custom-elements-manifest/analyzer",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "description": "",
   "license": "MIT",
   "type": "module",

diff --git a/packages/analyzer/src/features/framework-plugins/lit/static-properties.js b/packages/analyzer/src/features/framework-plugins/lit/static-properties.js
@@ -28,19 +28,19 @@ export function staticPropertiesPlugin() {
           if (isMixin(node)) {
             const { mixinFunction, mixinClass } = extractMixinNodes(node);
             const { name } = handleName({}, mixinFunction);
-            handleStaticProperties(mixinClass, moduleDoc, context, name);
+            handleStaticProperties(mixinClass, moduleDoc, context, name, ts);
           }
           break;
 
         case ts.SyntaxKind.ClassDeclaration:
-          handleStaticProperties(node, moduleDoc, context);
+          handleStaticProperties(node, moduleDoc, context, null, ts);
           break;
       }
     },
   };
 }
 
-function handleStaticProperties(classNode, moduleDoc, context, mixinName = null) {
+function handleStaticProperties(classNode, moduleDoc, context, mixinName = null, ts) {
   let className;
   if (!mixinName) {
     className = classNode?.name?.getText();
@@ -52,8 +52,9 @@ function handleStaticProperties(classNode, moduleDoc, context, mixinName = null)
   classNode?.members?.forEach(member => {
     if (hasStaticKeyword(member) && member.name.text === 'properties') {
       const propertiesObject = getPropertiesObject(member);
-
       propertiesObject?.properties?.forEach(property => {
+        if (property.kind !== ts.SyntaxKind.PropertyAssignment) return;
+
         let classMember = {
           kind: 'field',
           name: property?.name?.getText() || '',