bio-dts 0.6.1 → 0.7.0

package/README.md

@@ -6,7 +6,9 @@ Utilities to generate sane and clean type definitions from JavaScript files.
 
 ## About
 
-This module provides `pre` and `post` processing helpers to a type definition pipeline, as well as a simple [generator cli](#usage).
+This module provides `pre` and `post` processing helpers to a type definition pipeline.
+
+You can use it [via API](#api) or through a simple [generator cli](#usage).
 
 
 ## Usage

package/lib/post-transform.js

@@ -113,6 +113,10 @@ export default function transform(src) {
       ? node.params
       : node?.typeAnnotation?.typeAnnotation?.parameters;
 
+    const typeParameters = fnDeclaration
+      ? node.typeParameters
+      : node?.typeAnnotation?.typeAnnotation?.typeParameters;
+
     const returnType = fnDeclaration
       ? node.returnType
       : node?.typeAnnotation?.typeAnnotation?.typeAnnotation;
@@ -207,7 +211,10 @@ export default function transform(src) {
         returnType: returnType ? b.tsTypeAnnotation.from({
           ...returnType
         }) : null,
-        comments: hostPath === nodePath ? variationComments : []
+        comments: hostPath === nodePath ? variationComments : [],
+        typeParameters: typeParameters ? b.tsTypeParameterDeclaration.from({
+          ...typeParameters
+        }) : null
       });
 
       return (
@@ -227,6 +234,40 @@ export default function transform(src) {
   }
 
 
+  /**
+   * Ensures we don't re-export external declarations
+   *
+   * @example
+   *
+   * ```javascript
+   * export type Woop = import('./Woop').default;
+   *
+   * // ===>
+   *
+   * type Woop = import('./Woop').default;
+   * ```
+   *
+   * @param {import('./util.js').Path} nodePath
+   *
+   * @return {any[]} replacements
+   */
+  function fixTypeExport(nodePath) {
+
+    const {
+      value: node
+    } = nodePath;
+
+    if (
+      node.type !== 'ExportNamedDeclaration' ||
+      node.declaration?.typeAnnotation?.type !== 'TSImportType'
+    ) {
+      return;
+    }
+
+    replace(nodePath, nodePath.get('declaration').value);
+  }
+
+
   function cleanComment(comment) {
 
     const replacements = [];
@@ -308,6 +349,10 @@ export default function transform(src) {
       return false;
     }
 
+    if (fixTypeExport(path)) {
+      return false;
+    }
+
     cleanComments(path);
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bio-dts",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Generate sane and clean types from JavaScript sources",
   "type": "module",
   "main": "index.js",