Merge branch 'master' into feat/watch

thepassle · thepassle · commit e73873ec2802 · 2021-06-19T13:37:22.000+02:00
diff --git a/packages/analyzer/browser/index.js b/packages/analyzer/browser/index.js
diff --git a/packages/analyzer/custom-elements.json b/packages/analyzer/custom-elements.json
@@ -7,16 +7,64 @@
       "path": "fixtures/-default/package/bar.js",
       "declarations": [
         {
-          "kind": "function",
-          "name": "bar"
+          "kind": "class",
+          "description": "",
+          "name": "default",
+          "cssParts": [
+            {
+              "name": "foo"
+            }
+          ],
+          "members": [
+            {
+              "kind": "field",
+              "name": "propertyDecorator",
+              "type": {
+                "text": "string"
+              },
+              "default": "hi"
+            },
+            {
+              "kind": "field",
+              "name": "mobileopen",
+              "privacy": "public",
+              "default": "false"
+            }
+          ],
+          "attributes": [
+            {
+              "name": "propertyDecorator",
+              "type": {
+                "text": "string"
+              },
+              "default": "hi",
+              "fieldName": "propertyDecorator"
+            },
+            {
+              "name": "mobileopen",
+              "fieldName": "mobileopen"
+            }
+          ],
+          "superclass": {
+            "name": "LitElement"
+          },
+          "customElement": true
         }
       ],
       "exports": [
         {
           "kind": "js",
-          "name": "bar",
+          "name": "default",
+          "declaration": {
+            "name": "default",
+            "module": "fixtures/-default/package/bar.js"
+          }
+        },
+        {
+          "kind": "custom-element-definition",
+          "name": "top-bar",
           "declaration": {
-            "name": "bar",
+            "name": "TopBar",
             "module": "fixtures/-default/package/bar.js"
           }
         }
diff --git a/packages/analyzer/fixtures/class-attributes/output.json b/packages/analyzer/fixtures/class-attributes/output.json
@@ -49,8 +49,8 @@
           "superclass": {
             "name": "HTMLElement"
           },
-          "customElement": true,
-          "tagName": "my-el"
+          "tagName": "my-el",
+          "customElement": true
         },
         {
           "kind": "class",
diff --git a/packages/analyzer/fixtures/class-fields/output.json b/packages/analyzer/fixtures/class-fields/output.json
@@ -118,8 +118,8 @@
           "superclass": {
             "name": "HTMLElement"
           },
-          "customElement": true,
-          "tagName": "my-el"
+          "tagName": "my-el",
+          "customElement": true
         }
       ],
       "exports": [
diff --git a/packages/analyzer/fixtures/custom-elements-define/output.json b/packages/analyzer/fixtures/custom-elements-define/output.json
@@ -20,8 +20,8 @@
           "superclass": {
             "name": "HTMLElement"
           },
-          "customElement": true,
-          "tagName": "my-element"
+          "tagName": "my-element",
+          "customElement": true
         },
         {
           "kind": "class",
@@ -30,8 +30,8 @@
           "superclass": {
             "name": "HTMLElement"
           },
-          "customElement": true,
-          "tagName": "my-window"
+          "tagName": "my-window",
+          "customElement": true
         }
       ],
       "exports": [
diff --git a/packages/analyzer/fixtures/plugin-catalyst/output.json b/packages/analyzer/fixtures/plugin-catalyst/output.json
@@ -31,8 +31,8 @@
           "superclass": {
             "name": "HTMLElement"
           },
-          "customElement": true,
-          "tagName": "hello-world"
+          "tagName": "hello-world",
+          "customElement": true
         }
       ],
       "exports": [
diff --git a/packages/analyzer/fixtures/plugin-fast/output.json b/packages/analyzer/fixtures/plugin-fast/output.json
@@ -41,8 +41,8 @@
           "superclass": {
             "name": "FASTElement"
           },
-          "customElement": true,
-          "tagName": "name-tag"
+          "tagName": "name-tag",
+          "customElement": true
         }
       ],
       "exports": [
diff --git a/packages/analyzer/fixtures/plugin-lit/output.json b/packages/analyzer/fixtures/plugin-lit/output.json
@@ -70,8 +70,8 @@
           "superclass": {
             "name": "LitElement"
           },
-          "customElement": true,
-          "tagName": "my-element"
+          "tagName": "my-element",
+          "customElement": true
         }
       ],
       "exports": [
diff --git a/packages/analyzer/package.json b/packages/analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@custom-elements-manifest/analyzer",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "description": "",
   "license": "MIT",
   "type": "module",
diff --git a/packages/analyzer/src/features/analyse-phase/class-jsdoc.js b/packages/analyzer/src/features/analyse-phase/class-jsdoc.js
@@ -13,7 +13,8 @@ export function classJsDocPlugin() {
     analyzePhase({ts, node, moduleDoc}){
       switch (node.kind) {
         case ts.SyntaxKind.ClassDeclaration:
-          const className = node?.name?.text;
+          const hasDefaultModifier = node?.modifiers?.some(mod => ts.SyntaxKind.DefaultKeyword === mod.kind);
+          const className = hasDefaultModifier ? 'default' : node?.name?.getText();
           const classDoc = moduleDoc?.declarations?.find(declaration => declaration.name === className);
 
           /**
diff --git a/packages/analyzer/src/features/framework-plugins/decorators/attr.js b/packages/analyzer/src/features/framework-plugins/decorators/attr.js
@@ -8,7 +8,8 @@ export function attrDecoratorPlugin() {
     analyzePhase({ts, node, moduleDoc}){
       switch(node.kind) {
         case ts.SyntaxKind.ClassDeclaration:
-          const className = node?.name?.text;
+          const hasDefaultModifier = node?.modifiers?.some(mod => ts.SyntaxKind.DefaultKeyword === mod.kind);
+          const className = hasDefaultModifier ? 'default' : node?.name?.getText();
           const classDoc = moduleDoc?.declarations?.find(declaration => declaration.name === className);
 
           /**
diff --git a/packages/analyzer/src/features/framework-plugins/lit/property-decorator.js b/packages/analyzer/src/features/framework-plugins/lit/property-decorator.js
@@ -14,7 +14,8 @@ export function propertyDecoratorPlugin() {
     analyzePhase({ts, node, moduleDoc}){
       switch (node.kind) {
         case ts.SyntaxKind.ClassDeclaration:    
-          const className = node?.name?.getText();
+          const hasDefaultModifier = node?.modifiers?.some(mod => ts.SyntaxKind.DefaultKeyword === mod.kind);
+          const className = hasDefaultModifier ? 'default' : node?.name?.getText();
           const currClass = moduleDoc?.declarations?.find(declaration => declaration.name === className);
     
           /**
diff --git a/packages/analyzer/src/features/framework-plugins/lit/static-properties.js b/packages/analyzer/src/features/framework-plugins/lit/static-properties.js
@@ -13,7 +13,8 @@ export function staticPropertiesPlugin() {
     analyzePhase({ts, node, moduleDoc}){
       switch (node.kind) {
         case ts.SyntaxKind.ClassDeclaration:    
-          const className = node?.name?.getText();
+          const hasDefaultModifier = node?.modifiers?.some(mod => ts.SyntaxKind.DefaultKeyword === mod.kind);
+          const className = hasDefaultModifier ? 'default' : node?.name?.getText();
           const currClass = moduleDoc?.declarations?.find(declaration => declaration.name === className);
     
           node?.members?.forEach(member => {
@@ -39,10 +40,11 @@ export function staticPropertiesPlugin() {
                   if(attributeName) {
                     attribute.name = attributeName;
                   }
-                  currClass.attributes.push(attribute);
+
+                  currClass.attributes = [...(currClass?.attributes || []), attribute]
                 }
 
-                currClass.members.push(classMember);
+                currClass?.members.push(classMember);
               });
               return;
             }
diff --git a/packages/analyzer/src/features/framework-plugins/stencil/stencil.js b/packages/analyzer/src/features/framework-plugins/stencil/stencil.js
@@ -16,14 +16,14 @@ export function stencilPlugin() {
            * Add tagName to classDoc, extracted from `@Component({tag: 'foo-bar'})` decorator
            * Add custom-element-definition to exports
            */ 
-          const className = node?.name?.getText();
-
           const componentDecorator = node?.decorators?.find(decorator('Component'))?.expression;
 
           const tagName = componentDecorator?.arguments?.[0]?.properties?.find(prop => {
             return prop?.name?.getText() === 'tag'
           })?.initializer?.text;
 
+          const hasDefaultModifier = node?.modifiers?.some(mod => ts.SyntaxKind.DefaultKeyword === mod.kind);
+          const className = hasDefaultModifier ? 'default' : node?.name?.getText();
           const currClass = moduleDoc?.declarations?.find(declaration => declaration.name === className);
           if(tagName) {
             currClass.tagName = tagName;
diff --git a/packages/analyzer/src/features/index.js b/packages/analyzer/src/features/index.js
@@ -64,8 +64,8 @@ export const FEATURES = [
   cleanupClassesPlugin(),
 
   /** POST-PROCESSING */
-  isCustomElementPlugin(),
   linkClassToTagnamePlugin(),
+  isCustomElementPlugin(),
   applyInheritancePlugin(),
 
   /** FRAMEWORKS */

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@custom-elements-manifest/analyzer",`
`3`		`- "version": "0.2.1",`
	`3`	`+ "version": "0.2.4",`
`4`	`4`	`"description": "",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"type": "module",`