fix: multiple issue fixes

package.json

@@ -47,9 +47,6 @@
       "**/tests/index.ts"
     ]
   },
-  "dependencies": {
-    "slash": "^3.0.0"
-  },
   "devDependencies": {
     "@types/fs-readdir-recursive": "^1.0.0",
     "@types/jest": "^24.0.15",
@@ -59,6 +56,6 @@
     "standard-version": "^6.0.1",
     "ts-jest": "^24.0.2",
     "ttypescript": "^1.5.6",
-    "typescript": "^3.4.5"
+    "typescript": "^3.9.7"
   }
 }

src/index.ts

@@ -1,9 +1,24 @@
 import { dirname, relative, resolve, extname } from "path";
 import ts from "typescript";
-import slash from "slash";
 import { parse } from "url";
 import { existsSync } from "fs";
 
+
+/* ****************************************************************************************************************** *
+ * Helpers
+ * ****************************************************************************************************************** */
+
+export const normalizePath = (p: string) =>
+  // Is extended length or has non-ascii chars (respectively)
+  (/^\\\\\?\\/.test(p) || /[^\u0000-\u0080]+/.test(p)) ? p :
+  // Normalize to forward slash and remove repeating slashes
+  p.replace(/[\\\/]+/g, '/');
+
+
+/* ****************************************************************************************************************** *
+ * Transformer
+ * ****************************************************************************************************************** */
+
 const transformer = (_: ts.Program) => (context: ts.TransformationContext) => (
   sourceFile: ts.SourceFile
 ) => {
@@ -36,7 +51,7 @@ const transformer = (_: ts.Program) => (context: ts.TransformationContext) => (
     .filter(key => paths[key].length)
     .map(key => ({
       regexp: new RegExp("^" + key.replace("*", "(.*)") + "$"),
-      path: paths[key][0]
+      paths: paths[key]
     }));
 
   if (!baseUrl || binds.length === 0) {
@@ -66,19 +81,24 @@ const transformer = (_: ts.Program) => (context: ts.TransformationContext) => (
       return moduleName;
     }
 
-    for (const { regexp, path } of binds) {
+    for (const { regexp, paths } of binds) {
       const match = regexp.exec(moduleName);
       if (match) {
-        const out = path.replace(/\*/g, match[1]);
-        if (isUrl(out)) {
-          return out;
+        for (const p of paths) {
+          const out = p.replace(/\*/g, match[1]);
+
+          if (isUrl(out)) return out;
+
+          const filepath = resolve(baseUrl, out);
+          if (!fileExists(`${filepath}/index`) && !fileExists(filepath)) continue;
+
+          const resolved = fixupImportPath(relative(sourceDir, filepath));
+
+          return isRelative(resolved) ? resolved : `./${resolved}`;
         }
-        const filepath = resolve(baseUrl, out);
-        if (!fileExists(`${filepath}/index`) && !fileExists(filepath)) continue;
-        const resolved = slash(relative(sourceDir, filepath));
-        return isRelative(resolved) ? resolved : `./${resolved}`;
       }
     }
+
     return undefined;
   }
 
@@ -96,17 +116,6 @@ const transformer = (_: ts.Program) => (context: ts.TransformationContext) => (
     node.arguments.length === 1;
 
   function visit(node: ts.Node): ts.VisitResult<ts.Node> {
-    if (
-      !isDeclarationFile &&
-      resolver &&
-      ts.isExportDeclaration(node) &&
-      !node.exportClause &&
-      !compilerOptions.isolatedModules &&
-      !resolver.moduleExportsSomeValue(node.moduleSpecifier)
-    ) {
-      return undefined;
-    }
-
     if (isRequire(node) || isAsyncImport(node)) {
       return unpathRequireAndAsyncImport(node);
     }
@@ -224,7 +233,7 @@ const transformer = (_: ts.Program) => (context: ts.TransformationContext) => (
       ts.isNamedImports
     );
     return name || namedBindings
-      ? ts.updateImportClause(node, name, namedBindings)
+      ? ts.updateImportClause(node, name, namedBindings, node.isTypeOnly)
       : undefined;
   }
   function visitNamedImportBindings(
@@ -273,7 +282,8 @@ const transformer = (_: ts.Program) => (context: ts.TransformationContext) => (
         node.decorators,
         node.modifiers,
         node.exportClause,
-        fileLiteral
+        fileLiteral,
+        node.isTypeOnly
       );
     }
 
@@ -290,7 +300,8 @@ const transformer = (_: ts.Program) => (context: ts.TransformationContext) => (
           node.decorators,
           node.modifiers,
           node.exportClause,
-          fileLiteral
+          fileLiteral,
+          node.isTypeOnly
         )
       : undefined;
   }
@@ -312,6 +323,17 @@ const transformer = (_: ts.Program) => (context: ts.TransformationContext) => (
     return resolver.isValueAliasDeclaration(node) ? node : undefined;
   }
 
+  function fixupImportPath(p:string) {
+    let res = normalizePath(p);
+
+    /* Remove implicit extension */
+    const ext = extname(res);
+    if (ext && implicitExtensions.includes(ext.replace(/^\./, '')))
+      res = res.slice(0, -ext.length);
+
+    return res;
+  }
+
   return ts.visitNode(sourceFile, visit);
 };
 

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

@@ -1,5 +1,7 @@
 import sum = require("@utils/sum");
 export { sum } from "@utils";
+export { g } from "#utils/hello";
+export { sum as sum2 } from "#utils/sum";
 export { NoRuntimecodeHere } from "@utils/types-only";
 import { subs, NoRuntimecodeHere } from "@utils";
 import "@circular/b";
@@ -36,4 +38,4 @@ const a = new A("");
 
   testerClass.test(12);
   testerConst.test("12");
-})();
+})();

tests/__fixtures/with-path/secondary/hello.ts

@@ -0,0 +1 @@
+export const g = 'hello'

tests/__fixtures/with-path/tsconfig.json

@@ -8,6 +8,7 @@
     "paths": {
       "path": ["https://external.url/path.js"],
       "@*": ["*"],
+      "#utils/*": [ "./utils/*", "./secondary/*" ],
       "*": ["*"]
     },
 

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

@@ -1,3 +1,3 @@
 export * from "@utils/sum";
 export * from "@utils/subs";
-export * from "@utils/types-only";
+export { NoRuntimecodeHere } from "@utils/types-only";

tests/__fixtures/without-path/dir2/other.ts

@@ -0,0 +1 @@
+export const g = 'hello'

tests/index.ts

@@ -1,5 +1,5 @@
 import { dirname, relative, join } from "path";
-import slash = require("slash");
+import { normalizePath } from '../src'
 import read = require("fs-readdir-recursive");
 import { readFileSync } from "fs";
 
@@ -14,6 +14,9 @@ describe("with-path", () => {
         .replace(/"(@.*)"/g, (_, moduleName) => {
           return `"${bindModuleToFile(moduleName, sourceDir)}"`;
         })
+        .replace(/"(#utils\/.*)"/g, (_, moduleName) => {
+          return `"${bindModuleToFile(moduleName, sourceDir)}"`;
+        })
         .replace('"path"', '"https://external.url/path.js"')
         .replace('"circular/a"', '"../circular/a"');
       const generatedFile = join(
@@ -56,7 +59,13 @@ function bindModuleToFile(moduleName: string, sourceDir: string) {
   const match = /@(.*)/.exec(moduleName);
   if (match) {
     const out = match[1];
-    const file = slash(relative(sourceDir, out));
+    const file = normalizePath(relative(sourceDir, out));
     return file[0] === "." ? file : `./${file}`;
   }
+
+  let utilsModule = /^#utils\/(.+)/.exec(moduleName)?.[1];
+  if (utilsModule) {
+    const subDir = (utilsModule === 'hello') ? 'secondary' : 'utils';
+    return normalizePath(relative(sourceDir, join(subDir, utilsModule)));
+  }
 }

tests/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "exclude": [ "__fixtures" ],
+  "compilerOptions": {
+    "noEmit": true,
+    "strict": true,
+    "esModuleInterop": true
+  }
+}