@next-core/build-config-factory 2.21.0 → 2.22.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.22.0](https://github.com/easyops-cn/next-core/compare/@next-core/build-config-factory@2.21.0...@next-core/build-config-factory@2.22.0) (2022-07-11)
+
+
+### Features
+
+* **generateBrickDocs:** support function type ([b085bbf](https://github.com/easyops-cn/next-core/commit/b085bbf089b89dc6e7fa7f743a69731b24ea449a))
+
+
+
+
+
 # [2.21.0](https://github.com/easyops-cn/next-core/compare/@next-core/build-config-factory@2.20.0...@next-core/build-config-factory@2.21.0) (2022-07-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/build-config-factory",
-  "version": "2.21.0",
+  "version": "2.22.0",
   "description": "build config factory",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/build-config-factory",
   "license": "GPL-3.0",
@@ -37,5 +37,5 @@
     "typedoc": "^0.19.2",
     "typedoc-plugin-no-inherit": "^1.2.2"
   },
-  "gitHead": "34a0808712ecaa925d0860d281ab23cf3bec7317"
+  "gitHead": "42bab4e94fbac369b5e9953272d568ba5cfb15e8"
 }

package/src/generateBrickDocs.js

@@ -168,7 +168,7 @@ function composeBrickDocMethods(brick) {
             parameter.flags?.isOptional ? "?" : ""
           }: ${extractRealInterfaceType(parameter.type)}`
       )
-      .join(" "),
+      .join(", "),
     ...convertTagsToMapByFields(tags, methodComments),
   };
 }
@@ -335,15 +335,15 @@ function extractRealInterfaceType(typeData, parentType) {
         typeData.elementType,
         typeData.type
       )}[]`;
-    case "union":
-      if (parentType === "array") {
-        return `(${typeData.types
-          .map((type) => extractRealInterfaceType(type))
-          .join(" | ")})`;
-      }
-      return typeData.types
-        .map((type) => extractRealInterfaceType(type))
+    case "union": {
+      const typeStr = typeData.types
+        .map((type) => extractRealInterfaceType(type, typeData.type))
         .join(" | ");
+
+      return parentType === "array" || parentType === "union"
+        ? `(${typeStr})`
+        : typeStr;
+    }
     case "stringLiteral":
       return `"${typeData.value}"`;
     case "intrinsic":
@@ -356,23 +356,43 @@ function extractRealInterfaceType(typeData, parentType) {
         .join(" & ");
     case "reflection": {
       if (typeData.declaration) {
-        const { children = [], indexSignature = [] } = typeData.declaration;
-
-        return `{ ${[
-          ...children.map(
-            (child) =>
-              `${child.name}${
-                child.flags?.isOptional ? "?" : ""
-              }: ${extractRealInterfaceType(child.type)};`
-          ),
-          ...indexSignature.map((item) => {
-            const parameter = item.parameters[0];
-            return `[${parameter.name}: ${extractRealInterfaceType(
-              parameter.type.type,
-              parameter.type
-            )}]: ${extractRealInterfaceType(item.type)};`;
-          }),
-        ].join(" ")} }`;
+        const {
+          signatures,
+          children = [],
+          indexSignature = [],
+        } = typeData.declaration;
+
+        if (signatures) {
+          const { parameters, type } = signatures[0];
+          const typeStr = `(${parameters
+            ?.map(
+              (parameter) =>
+                `${parameter.name}${
+                  parameter.flags?.isOptional ? "?" : ""
+                }: ${extractRealInterfaceType(parameter.type)}`
+            )
+            .join(", ")}) => ${extractRealInterfaceType(type)}`;
+
+          return parentType === "array" || parentType === "union"
+            ? `(${typeStr})`
+            : typeStr;
+        } else {
+          return `{ ${[
+            ...children.map(
+              (child) =>
+                `${child.name}${
+                  child.flags?.isOptional ? "?" : ""
+                }: ${extractRealInterfaceType(child.type)};`
+            ),
+            ...indexSignature.map((item) => {
+              const parameter = item.parameters[0];
+              return `[${parameter.name}: ${extractRealInterfaceType(
+                parameter.type.type,
+                parameter.type
+              )}]: ${extractRealInterfaceType(item.type)};`;
+            }),
+          ].join(" ")} }`;
+        }
       } else {
         return "object";
       }
@@ -634,6 +654,43 @@ function traverseUsedReferenceIdsByType(
         traversedTypeSet
       );
       break;
+    case "reflection":
+      if (type.declaration) {
+        const { signatures, children, indexSignature } = type.declaration;
+
+        signatures?.forEach((signature) => {
+          signature.parameters?.forEach((parameter) =>
+            traverseUsedReferenceIdsByType(
+              parameter.type,
+              usedReferenceIds,
+              references,
+              traversedTypeSet
+            )
+          );
+          traverseUsedReferenceIdsByType(
+            signature.type,
+            usedReferenceIds,
+            references,
+            traversedTypeSet
+          );
+        });
+        children?.forEach((child) => {
+          traverseUsedReferenceIdsByType(
+            child.type,
+            usedReferenceIds,
+            references,
+            traversedTypeSet
+          );
+        });
+        indexSignature?.forEach((item) => {
+          traverseUsedReferenceIdsByType(
+            item.type,
+            usedReferenceIds,
+            references,
+            traversedTypeSet
+          );
+        });
+      }
   }
 }