@next-core/build-config-factory 2.18.51 → 2.20.0

package/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.20.0](https://github.com/easyops-cn/next-core/compare/@next-core/build-config-factory@2.19.0...@next-core/build-config-factory@2.20.0) (2022-07-05)
+
+
+### Features
+
+* **generateBrickDocs:** support infer required and default of property and detail of event from declaration ([6a60f26](https://github.com/easyops-cn/next-core/commit/6a60f26563683d89d5b36bb766f973cb23522e70))
+
+
+
+
+
+# [2.19.0](https://github.com/easyops-cn/next-core/compare/@next-core/build-config-factory@2.18.52...@next-core/build-config-factory@2.19.0) (2022-07-05)
+
+
+### Bug Fixes
+
+* **generateBrickDocs:** type will not be traversed in another module once traversed ([c539bcf](https://github.com/easyops-cn/next-core/commit/c539bcf86a8d7d0955f4115373db838032c5c677))
+
+
+### Features
+
+* **generateBrickDocs:** add support for extendedTypes ([12c9e53](https://github.com/easyops-cn/next-core/commit/12c9e536b07104a9ee8478cbe8c2aa6887751335))
+* **generateBrickDocs:** add support for index signature ([1f16c2c](https://github.com/easyops-cn/next-core/commit/1f16c2c1a961a43a139f8bef1117c8eb4e4ba3f6))
+
+
+
+
+
+## [2.18.52](https://github.com/easyops-cn/next-core/compare/@next-core/build-config-factory@2.18.51...@next-core/build-config-factory@2.18.52) (2022-06-28)
+
+**Note:** Version bump only for package @next-core/build-config-factory
+
+
+
+
+
 ## [2.18.51](https://github.com/easyops-cn/next-core/compare/@next-core/build-config-factory@2.18.50...@next-core/build-config-factory@2.18.51) (2022-06-27)
 
 **Note:** Version bump only for package @next-core/build-config-factory

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/build-config-factory",
-  "version": "2.18.51",
+  "version": "2.20.0",
   "description": "build config factory",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/build-config-factory",
   "license": "GPL-3.0",
@@ -18,10 +18,10 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@next-core/brick-utils": "^2.37.19",
+    "@next-core/brick-utils": "^2.37.20",
     "@next-core/repo-config": "^0.2.1",
     "@next-core/typedoc-plugin-filter-inherit": "^1.2.2",
-    "@next-core/webpack-config-factory": "^2.16.5",
+    "@next-core/webpack-config-factory": "^2.16.6",
     "change-case": "^4.1.2",
     "chokidar": "^3.5.3",
     "fs-extra": "^10.1.0",
@@ -37,5 +37,5 @@
     "typedoc": "^0.19.2",
     "typedoc-plugin-no-inherit": "^1.2.2"
   },
-  "gitHead": "d514ec0e78f1d243f88eba481bdf4f8b6fd823e5"
+  "gitHead": "81ac28a0f1346239d497cd23acc7795e5f8c21cc"
 }

package/src/generateBrickDocs.js

@@ -101,11 +101,12 @@ function convertTagsToMapByFields(tags, fields) {
 }
 
 function composeBrickDocProperties(brick) {
-  const { name, comment } = brick;
-  const type = brick.type && brick.type.type;
+  const { name, comment, type, flags, defaultValue } = brick;
   return {
     name,
-    type: extractRealInterfaceType(type, brick.type),
+    type: extractRealInterfaceType(type?.type, type),
+    required: flags?.isOptional !== true,
+    default: defaultValue,
     ...convertTagsToMapByFields(get(comment, "tags", []), propertyDocComments),
   };
 }
@@ -122,11 +123,19 @@ function getEventTypeByDecorators(decorators) {
   return null;
 }
 
+function getDetailTypeByEventType(type) {
+  if (type.name === "EventEmitter" && type.typeArguments?.length > 0) {
+    const argument = type.typeArguments[0];
+    return extractRealInterfaceType(argument.type, argument);
+  }
+}
+
 function composeBrickDocEvents(brick) {
-  const { comment, decorators } = brick;
+  const { comment, decorators, type } = brick;
 
   return {
     type: getEventTypeByDecorators(decorators),
+    detail: getDetailTypeByEventType(type),
     ...convertTagsToMapByFields(get(comment, "tags", []), eventDocComments),
   };
 }
@@ -392,16 +401,32 @@ function extractBrickDocInterface(typeIds, references) {
             name: finder.name,
             typeParameter: getTypeParameter(finder),
             kind: "interface",
-            children: [
-              ...finder.children.map((child) => {
+            extendedTypes: finder.extendedTypes,
+            children:
+              finder.children?.map((child) => {
+                return {
+                  name: child.name,
+                  type: extractRealInterfaceType(child.type.type, child.type),
+                  required: !get(child, ["flags", "isOptional"], false),
+                  description: get(child, ["comment", "shortText"], "").trim(),
+                };
+              }) || [],
+            indexSignature:
+              finder.indexSignature?.map((child) => {
                 return {
                   name: child.name,
+                  parameters: child.parameters.map((parameter) => ({
+                    ...parameter,
+                    type: extractRealInterfaceType(
+                      parameter.type.type,
+                      parameter.type
+                    ),
+                  })),
                   type: extractRealInterfaceType(child.type.type, child.type),
                   required: !get(child, ["flags", "isOptional"], false),
                   description: get(child, ["comment", "shortText"], "").trim(),
                 };
-              }),
-            ],
+              }) || [],
           };
         }
 
@@ -438,10 +463,16 @@ function traverseExtraInterfaceReferences(modules, References) {
 function traverseElementUsedInterfaceIds(
   element,
   usedReferenceIds,
-  references
+  references,
+  traversedTypeSet
 ) {
   element.children.forEach((child) => {
-    traverseUsedReferenceIdsByType(child.type, usedReferenceIds, references);
+    traverseUsedReferenceIdsByType(
+      child.type,
+      usedReferenceIds,
+      references,
+      traversedTypeSet
+    );
   });
 }
 
@@ -461,13 +492,19 @@ function traverseModules(modules, brickDocs) {
     if (!elementId) return;
 
     const usedReferenceIds = new Set();
+    const traversedTypeSet = new Set();
     const classElement = module.children.find(
       (child) => child.id === elementId && existBrickDocId(child)
     );
     if (!classElement) return;
     const { comment, children, groups } = classElement;
     const references = [...module.children, ...extraInterfaceReferencesValues];
-    traverseElementUsedInterfaceIds(classElement, usedReferenceIds, references);
+    traverseElementUsedInterfaceIds(
+      classElement,
+      usedReferenceIds,
+      references,
+      traversedTypeSet
+    );
     const brick = {
       ...extractBrickDocBaseKind(comment.tags),
       ...extractBrickDocComplexKind(groups, children),
@@ -480,25 +517,38 @@ function traverseModules(modules, brickDocs) {
   });
 }
 
-function traverseUsedReferenceIdsByType(type, usedReferenceIds, references) {
+function traverseUsedReferenceIdsByType(
+  type,
+  usedReferenceIds,
+  references,
+  traversedTypeSet
+) {
   if (!type || !type.type) return;
 
-  if (type.$$traversed) {
+  if (traversedTypeSet.has(type)) {
     return;
   }
-  type.$$traversed = true;
+
+  traversedTypeSet.add(type);
+
   switch (type.type) {
     case "union":
     case "intersection":
       type.types.forEach((item) =>
-        traverseUsedReferenceIdsByType(item, usedReferenceIds, references)
+        traverseUsedReferenceIdsByType(
+          item,
+          usedReferenceIds,
+          references,
+          traversedTypeSet
+        )
       );
       break;
     case "array":
       traverseUsedReferenceIdsByType(
         type.elementType,
         usedReferenceIds,
-        references
+        references,
+        traversedTypeSet
       );
       break;
     case "reference":
@@ -507,12 +557,18 @@ function traverseUsedReferenceIdsByType(type, usedReferenceIds, references) {
         traverseUsedReferenceIdsByReflection(
           references.find((child) => child.id === type.id),
           usedReferenceIds,
-          references
+          references,
+          traversedTypeSet
         );
       }
       if (type.typeArguments && type.typeArguments.length > 0) {
         type.typeArguments.forEach((item) =>
-          traverseUsedReferenceIdsByType(item, usedReferenceIds, references)
+          traverseUsedReferenceIdsByType(
+            item,
+            usedReferenceIds,
+            references,
+            traversedTypeSet
+          )
         );
       }
       break;
@@ -521,7 +577,8 @@ function traverseUsedReferenceIdsByType(type, usedReferenceIds, references) {
       traverseUsedReferenceIdsByType(
         type.objectType,
         usedReferenceIds,
-        references
+        references,
+        traversedTypeSet
       );
       break;
   }
@@ -530,20 +587,40 @@ function traverseUsedReferenceIdsByType(type, usedReferenceIds, references) {
 function traverseUsedReferenceIdsByReflection(
   reflection,
   usedReferenceIds,
-  references
+  references,
+  traversedTypeSet
 ) {
   if (!reflection) {
     return;
   }
   switch (reflection.kindString) {
     case "Interface":
+      reflection.extendedTypes?.forEach((type) =>
+        traverseUsedReferenceIdsByType(
+          type,
+          usedReferenceIds,
+          references,
+          traversedTypeSet
+        )
+      );
       reflection.children
-        .filter((item) => item.kindString === "Property")
+        ?.filter((item) => item.kindString === "Property")
+        .forEach((item) =>
+          traverseUsedReferenceIdsByType(
+            item.type,
+            usedReferenceIds,
+            references,
+            traversedTypeSet
+          )
+        );
+      reflection.indexSignature
+        ?.filter((item) => item.kindString === "Index signature")
         .forEach((item) =>
           traverseUsedReferenceIdsByType(
             item.type,
             usedReferenceIds,
-            references
+            references,
+            traversedTypeSet
           )
         );
       break;
@@ -551,7 +628,8 @@ function traverseUsedReferenceIdsByReflection(
       traverseUsedReferenceIdsByType(
         reflection.type,
         usedReferenceIds,
-        references
+        references,
+        traversedTypeSet
       );
       break;
   }
@@ -590,7 +668,7 @@ function generateBrickBook(docsJson) {
   fs.writeFileSync(storiesPath, JSON.stringify(stories, null, 2), {
     encoding: "utf-8",
   });
-  console.log("Brick book written to doc.json.");
+  console.log("Brick book written to stories.json.");
 }
 
 module.exports = function generateBrickDocs(packageName) {