fix: justkey007#20

Author: justkey007

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run format && npm test

.prettierignore

@@ -0,0 +1 @@
+**/dist

.prettierrc

@@ -1,5 +1,6 @@
 {
   "tabWidth": 2,
   "useTabs": false,
-  "singleQuote": true
+  "singleQuote": true,
+  "trailingComma" : "none"
 }

package.json

@@ -10,9 +10,10 @@
     "tsc-alias": "dist/bin/index.js"
   },
   "scripts": {
+    "prepare": "husky install",
     "build:dev": "tsc -w",
     "clean": "npm unlink && rimraf dist && tsc && npm link && rimraf package-lock.json",
-    "release:patch": "npm test && npm version patch",
+    "release:patch": "npm version patch",
     "postversion": "git push && git push --tags && npm publish",
     "format": "prettier --write \"**/*.{js,ts}\"",
     "test": "npm run clean && jest"
@@ -49,6 +50,7 @@
     "@types/jest": "^26.0.20",
     "@types/node": "^11.12.0",
     "@types/shelljs": "^0.8.8",
+    "husky": "^5.1.3",
     "jest": "^26.6.3",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2",

pnpm-lock.yaml

@@ -0,0 +1,10 @@
+{
+  "private": true,
+  "scripts": {
+    "build": "npm i && tsc && tsc-alias",
+    "start": "npm run build && node ./dist/index.js"
+  },
+  "dependencies": {
+    "@esfx/collections-hashmap": "^1.0.0-pre.17"
+  }
+}

projects/project6/package-lock.json

@@ -0,0 +1,3 @@
+import { HashMap } from '@esfx/collections-hashmap';
+
+const map = new HashMap();

projects/project6/package.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "outDir": "dist",
+    "baseUrl": "./src",
+    "paths": {
+      "@/*": [
+        "./*",
+      ],
+    },
+  },
+}

projects/project6/src/index.ts

@@ -18,5 +18,5 @@ program
 replaceTscAliasPaths({
   configFile: program.project,
   watch: !!program.watch,
-  outDir: program.directory,
+  outDir: program.directory
 });

projects/project6/tsconfig.json

@@ -36,8 +36,8 @@ export const loadConfig = (file: string): ITSConfig => {
     compilerOptions: { baseUrl, outDir, paths } = {
       baseUrl: undefined,
       outDir: undefined,
-      paths: undefined,
-    },
+      paths: undefined
+    }
   } = FileUtils.toObject(file) as IRawTSConfig;
 
   const config: ITSConfig = {};
@@ -65,7 +65,7 @@ export const loadConfig = (file: string): ITSConfig => {
     }
     return {
       ...parentConfig,
-      ...config,
+      ...config
     };
   }
 
@@ -80,11 +80,11 @@ export function getProjectDirPathInOutDir(
     [
       `${outDir}/**/${projectDir}`,
       `!${outDir}/**/${projectDir}/**/${projectDir}`,
-      `!${outDir}/**/node_modules`,
+      `!${outDir}/**/node_modules`
     ],
     {
       dot: true,
-      onlyDirectories: true,
+      onlyDirectories: true
     }
   );
 
@@ -101,7 +101,7 @@ export function existsResolvedAlias(path: string): boolean {
   const globPattern = [`${path}.{js,jsx}`];
   const files = sync(globPattern, {
     dot: true,
-    onlyFiles: true,
+    onlyFiles: true
   });
 
   if (files.length) return true;

src/bin/index.ts

@@ -24,8 +24,8 @@ export function replaceTscAliasPaths(
     outDir?: string;
     watch?: boolean;
   } = {
-      watch: false,
-    }
+    watch: false
+  }
 ) {
   Output.info('=== tsc-alias starting ===');
   if (!options.configFile) {
@@ -120,7 +120,7 @@ export function replaceTscAliasPaths(
         basePath,
         path,
         paths: _paths,
-        isExtra,
+        isExtra
       };
     })
     .filter(({ prefix }) => prefix);
@@ -130,9 +130,10 @@ export function replaceTscAliasPaths(
     if (normalize(alias.path).includes('..')) {
       const tempBasePath = normalizePath(
         normalize(
-          `${configDir}/${outDir}/${hasExtraModule && relConfDirPathInOutPath
-            ? relConfDirPathInOutPath
-            : ''
+          `${configDir}/${outDir}/${
+            hasExtraModule && relConfDirPathInOutPath
+              ? relConfDirPathInOutPath
+              : ''
           }/${baseUrl}`
         )
       );
@@ -166,15 +167,17 @@ export function replaceTscAliasPaths(
   const replaceImportStatement = ({
     orig,
     file,
-    alias,
+    alias
   }: {
     orig: string;
     file: string;
     alias: typeof aliases[0];
   }): string => {
     const requiredModule = orig.split(/"|'/)[1];
     const index = orig.indexOf(alias.prefix);
-    const isAlias = requiredModule.startsWith(alias.prefix);
+    const isAlias = requiredModule.includes('/')
+      ? requiredModule.startsWith(alias.prefix + '/')
+      : requiredModule.startsWith(alias.prefix);
     if (index > -1 && isAlias) {
       let absoluteAliasPath = getAbsoluteAliasPath(alias.basePath, alias.path);
       let relativeAliasPath: string = normalizePath(
@@ -201,19 +204,19 @@ export function replaceTscAliasPaths(
     for (const alias of aliases) {
       const replacementParams = {
         file,
-        alias,
+        alias
       };
       tempCode = tempCode
         .replace(requireRegex, (orig) =>
           replaceImportStatement({
             orig,
-            ...replacementParams,
+            ...replacementParams
           })
         )
         .replace(importRegex, (orig) =>
           replaceImportStatement({
             orig,
-            ...replacementParams,
+            ...replacementParams
           })
         );
     }
@@ -227,11 +230,11 @@ export function replaceTscAliasPaths(
   // Finding files and changing alias paths
   const globPattern = [
     `${outPath}/**/*.{js,jsx,ts,tsx}`,
-    `!${outPath}/**/node_modules`,
+    `!${outPath}/**/node_modules`
   ];
   const files = sync(globPattern, {
     dot: true,
-    onlyFiles: true,
+    onlyFiles: true
   });
 
   const flen = files.length;

src/helpers.ts

@@ -3,11 +3,11 @@ import * as shell from 'shelljs';
 
 const projectsRoot = join(__dirname, '../projects');
 
-[1, 3, 4, 5].forEach((value) => {
+[1, 3, 4, 5, 6].forEach((value) => {
   it(`Project ${value}`, () => {
     const { code, stderr } = shell.exec('npm start', {
       cwd: join(projectsRoot, `project${value}`),
-      silent: true,
+      silent: true
     });
     if (code !== 0) console.error(stderr);
     expect(code).toEqual(0);