bio-dts 0.1.2 → 0.2.1

package/lib/post-transform.js

@@ -1,6 +1,4 @@
-import { print } from 'recast';
-
-import { isArray, isNode, keys, parseDts, path } from './util.js';
+import { isArray, isNode, keys, parseDts, path, print } from './util.js';
 
 
 /**
@@ -38,6 +36,12 @@ export default function transform(src) {
     }
 
     // TODO(nikku): transform illegal typescript methods into override calls
+
+    // TODO(nikku): remove annotations
+    //
+    // * @typedef
+    // * @class
+    // * @constructor
   });
 
   return print(ast).code;

package/lib/pre-transform.js

@@ -1,6 +1,4 @@
-import { print } from 'recast';
-
-import { matcher, parse, path } from './util.js';
+import { matcher, parse, path, print } from './util.js';
 
 import {
   builders as b
@@ -148,19 +146,31 @@ export default function transform(src) {
   const ast = parse(src);
   const body = path(ast).get('program', 'body');
 
+  const inheritsImports = findInheritsImports(body);
+
   const classes = findConstructors(body);
 
+  // query
   for (const cls of classes) {
-    const members = cls.members = [
+    cls.members = [
       ...findEmbeddedMethods(cls),
       ...findProtoMethods(cls, body)
     ];
 
-    const staticMembers = cls.staticMembers = [
+    cls.staticMembers = [
       ...findStaticMembers(cls, body)
     ];
 
-    const superDeclaration = cls.superDeclaration = findSuperDeclarations(cls, body);
+    cls.superDeclaration = findSuperDeclarations(cls, body, inheritsImports);
+  }
+
+  // transform
+  for (const cls of classes) {
+    const {
+      members,
+      staticMembers,
+      superDeclaration
+    } = cls;
 
     if (superDeclaration) {
       cls.ctor.get('body', 'body').unshift(superCall());
@@ -189,26 +199,34 @@ export default function transform(src) {
     });
 
     if (superDeclaration) {
-      superDeclaration.importDeclarations.forEach(m => m.node.replace());
       superDeclaration.inheritsExpression.node.replace();
     }
   }
 
+  inheritsImports.forEach(m => m.node.replace());
+
   return print(ast).code;
 }
 
-function findSuperDeclarations(cls, nodes) {
-
+function findInheritsImports(nodes) {
   const importsMatches = matcher`
     import $1 from 'inherits-browser';
   `;
 
-  const importDeclarations = importsMatches(nodes);
+  return importsMatches(nodes).map(m => {
+    return {
+      node: m[0],
+      name: m[1].value.name
+    };
+  });
+}
+
+function findSuperDeclarations(cls, nodes, importDeclarations) {
 
-  for (const [ _, identifier ] of importDeclarations) {
+  for (const { name: inheritsName } of importDeclarations) {
 
     const inheritsMatches = matcher`
-      ${identifier.value.name}(${cls.name}, $1);
+      ${inheritsName}(${cls.name}, $1);
     `;
 
     const inheritsExpressions = inheritsMatches(nodes);
@@ -232,7 +250,6 @@ function findSuperDeclarations(cls, nodes) {
       const superCalls = superCallMatches(cls.ctor.get('body', 'body'));
 
       return {
-        importDeclarations: importDeclarations.map(m => ({ node: m[0] })),
         superCalls: superCalls.map(m => ({ node: m[0] })),
         clazz,
         inheritsExpression

package/lib/util.js

@@ -1,4 +1,4 @@
-import { parse as recastParse } from 'recast';
+import { parse as recastParse, print as recastPrint } from 'recast';
 import { Path as PathConstructor } from 'ast-types';
 
 /**
@@ -13,6 +13,13 @@ import * as typescriptDtsParser from './parsers/typescript-dts.js';
 
 const DBG = /match/.test(process?.env?.LOG_DEBUG);
 
+const formatOptions = {
+  useTabs: false,
+  reuseWhitespace: false,
+  tabWidth: 2,
+  quote: 'single'
+};
+
 /**
  * Return numeric or string keys of the given object.
  *
@@ -51,16 +58,22 @@ export function hasProperty(obj, property) {
  */
 export function parse(code) {
   return recastParse(code, {
-    parser: typescriptParser
+    parser: typescriptParser,
+    ...formatOptions
   });
 }
 
 export function parseDts(code) {
   return recastParse(code, {
-    parser: typescriptDtsParser
+    parser: typescriptDtsParser,
+    ...formatOptions
   });
 }
 
+export function print(node) {
+  return recastPrint(node, formatOptions);
+}
+
 /**
  * @param {any} node
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bio-dts",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "description": "Generate sane and clean types from JavaScript sources",
   "type": "module",
   "main": "index.js",
@@ -9,7 +9,7 @@
     "all": "npm run lint && npm run test && npm run test:dts",
     "lint": "eslint .",
     "test": "mocha test",
-    "test:dts": "node bin/bio-dts.js --outDir dist -r test/fixtures"
+    "test:dts": "node bin/cmd.js --outDir dist -r test/fixtures"
   },
   "author": "Nico Rehwaldt",
   "license": "MIT",