FIXED: dynamic type imports

src/index.ts

@@ -65,6 +65,7 @@ const transformer = (_: ts.Program) => (context: ts.TransformationContext) => (
       // if it's relative path do not transform
       return moduleName;
     }
+
     for (const { regexp, path } of binds) {
       const match = regexp.exec(moduleName);
       if (match) {
@@ -81,6 +82,19 @@ const transformer = (_: ts.Program) => (context: ts.TransformationContext) => (
     return undefined;
   }
 
+  const isRequire = (node: ts.Node): node is ts.CallExpression =>
+    ts.isCallExpression(node) &&
+    ts.isIdentifier(node.expression) &&
+    node.expression.text === "require" &&
+    ts.isStringLiteral(node.arguments[0]) &&
+    node.arguments.length === 1;
+
+  const isAsyncImport = (node: ts.Node): node is ts.CallExpression =>
+    ts.isCallExpression(node) &&
+    node.expression.kind === ts.SyntaxKind.ImportKeyword &&
+    ts.isStringLiteral(node.arguments[0]) &&
+    node.arguments.length === 1;
+
   function visit(node: ts.Node): ts.VisitResult<ts.Node> {
     if (
       !isDeclarationFile &&
@@ -92,36 +106,71 @@ const transformer = (_: ts.Program) => (context: ts.TransformationContext) => (
     ) {
       return undefined;
     }
-    if (
-      ts.isCallExpression(node) &&
-      ts.isIdentifier(node.expression) &&
-      node.expression.text === "require" &&
-      ts.isStringLiteral(node.arguments[0]) &&
-      node.arguments.length === 1
-    ) {
-      const firstArg = node.arguments[0] as ts.StringLiteral;
-      const file = bindModuleToFile(firstArg.text);
-      if (!file) {
-        return node;
-      }
-      const fileLiteral = ts.createLiteral(file);
-      return ts.updateCall(node, node.expression, node.typeArguments, [
-        fileLiteral
-      ]);
+
+    if (isRequire(node) || isAsyncImport(node)) {
+      return unpathRequireAndAsyncImport(node);
     }
+
     if (ts.isExternalModuleReference(node)) {
       return unpathImportEqualsDeclaration(node);
     }
+
     if (ts.isImportDeclaration(node)) {
       return unpathImportDeclaration(node);
     }
+
     if (ts.isExportDeclaration(node)) {
       return unpathExportDeclaration(node);
     }
 
+    if (ts.isImportTypeNode(node)) {
+      return unpathImportTypeNode(node);
+    }
+
     return ts.visitEachChild(node, visit, context);
   }
 
+  function unpathRequireAndAsyncImport(node: ts.CallExpression) {
+    const firstArg = node.arguments[0] as ts.StringLiteral;
+    const file = bindModuleToFile(firstArg.text);
+
+    if (!file) {
+      return node;
+    }
+
+    const fileLiteral = ts.createLiteral(file);
+
+    return ts.updateCall(node, node.expression, node.typeArguments, [
+      fileLiteral
+    ]);
+  }
+
+  function unpathImportTypeNode(node: ts.ImportTypeNode) {
+    const argument = node.argument as ts.LiteralTypeNode;
+    const literal = argument.literal;
+
+    if (!ts.isStringLiteral(literal)) {
+      return node;
+    }
+
+    const file = bindModuleToFile(literal.text);
+
+    if (!file) {
+      return node;
+    }
+
+    const fileLiteral = ts.createLiteral(file);
+    const fileArgument = ts.updateLiteralTypeNode(argument, fileLiteral);
+
+    return ts.updateImportTypeNode(
+      node,
+      fileArgument,
+      node.qualifier,
+      node.typeArguments,
+      node.isTypeOf
+    );
+  }
+
   function unpathImportEqualsDeclaration(node: ts.ExternalModuleReference) {
     if (!ts.isStringLiteral(node.expression)) {
       return node;

tests/__fixtures/with-path/core/index.ts

@@ -20,3 +20,20 @@ const n: NoRuntimecodeHere = null as any;
 
 subs(2, 3);
 const a = new A("");
+
+(async function() {
+  const Logger = await (await import("@dynamic/logger")).Logger;
+  const logger = new Logger();
+
+  logger.log('hi');
+})();
+
+(async function() {
+  const Tester = (await import("@dynamic/tester")).Tester;
+
+  const testerConst = (await import("@dynamic/tester")).tester;
+  const testerClass = new Tester();
+
+  testerClass.test(12);
+  testerConst.test("12");
+})();

tests/__fixtures/with-path/dynamic/logger.ts

@@ -0,0 +1,10 @@
+type Tester = import("@dynamic/tester").Tester;
+
+export class Logger {
+  level: string = 'hi';
+  tester: Tester;
+
+  public log (x: string): void {
+    console.log(x);
+  };
+}

tests/__fixtures/with-path/dynamic/tester.ts

@@ -0,0 +1,9 @@
+export class Tester {
+  public test (x: number): void {
+    console.log(x);
+  };
+}
+
+export const tester = {
+  test: (x: string) => console.log(x),
+};