tsc-alias - npm Package Compare versions

Comparing version 1.3.7 to 1.3.8

dist/bin/index.js

@@ -15,3 +15,3 @@ #! /usr/bin/env node
     .option('-s, --silent', 'reduced terminal output')
-    .parse(process.argv);
+    .parseAsync(process.argv);
 __1.replaceTscAliasPaths({
@@ -18,0 +18,0 @@ configFile: program.project,

dist/index.d.ts

@@ -8,2 +8,2 @@ export interface ReplaceTscAliasPathsOptions {
 }
-export declare function replaceTscAliasPaths(options?: ReplaceTscAliasPathsOptions): void;
+export declare function replaceTscAliasPaths(options?: ReplaceTscAliasPathsOptions): Promise<void>;

dist/index.js

 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -15,176 +24,172 @@ exports.replaceTscAliasPaths = void 0;
 }) {
-    const output = new utils_1.Output(options.silent);
-    output.info('=== tsc-alias starting ===');
-    if (!options.configFile) {
-        options.configFile = path_1.resolve(process.cwd(), 'tsconfig.json');
-    }
-    else {
-        if (!path_1.isAbsolute(options.configFile)) {
-            options.configFile = path_1.resolve(process.cwd(), options.configFile);
+    return __awaiter(this, void 0, void 0, function* () {
+        const output = new utils_1.Output(options.silent);
+        output.info('=== tsc-alias starting ===');
+        if (!options.configFile) {
+            options.configFile = path_1.resolve(process.cwd(), 'tsconfig.json');
         }
-    }
-    const configFile = options.configFile;
-    const assert = (claim, message) => claim || output.error(message, true);
-    assert(fs_1.existsSync(configFile), `Invalid file path => ${configFile}`);
-    let { baseUrl, outDir, paths } = helpers_1.loadConfig(configFile);
-    if (options.outDir) {
-        outDir = options.outDir;
-    }
-    assert(baseUrl, 'compilerOptions.baseUrl is not set');
-    assert(paths, 'compilerOptions.paths is not set');
-    assert(outDir, 'compilerOptions.outDir is not set');
-    const configDir = normalizePath(path_1.dirname(configFile));
-    const outPath = normalizePath(path_1.normalize(configDir + '/' + outDir));
-    const confDirParentFolderName = path_1.basename(configDir);
-    let hasExtraModule = false;
-    let configDirInOutPath = null;
-    let relConfDirPathInOutPath;
-    const aliases = Object.keys(paths)
-        .map((alias) => {
-        const _paths = paths[alias].map((path) => {
-            path = path.replace(/\*$/, '').replace(/\.ts(x)?$/, '.js$1');
-            if (path_1.isAbsolute(path)) {
-                path = path_1.relative(configDir, path);
+        else {
+            if (!path_1.isAbsolute(options.configFile)) {
+                options.configFile = path_1.resolve(process.cwd(), options.configFile);
             }
-            return path;
-        });
-        const path = _paths[0];
-        const isExtra = null;
-        const basePath = null;
-        if (path_1.normalize(path).includes('..')) {
-            if (!configDirInOutPath) {
-                configDirInOutPath = helpers_1.getProjectDirPathInOutDir(outPath, confDirParentFolderName);
-                if (configDirInOutPath) {
-                    hasExtraModule = true;
+        }
+        const configFile = options.configFile;
+        const assert = (claim, message) => claim || output.error(message, true);
+        assert(fs_1.existsSync(configFile), `Invalid file path => ${configFile}`);
+        let { baseUrl, outDir, paths } = helpers_1.loadConfig(configFile);
+        if (options.outDir) {
+            outDir = options.outDir;
+        }
+        assert(baseUrl, 'compilerOptions.baseUrl is not set');
+        assert(paths, 'compilerOptions.paths is not set');
+        assert(outDir, 'compilerOptions.outDir is not set');
+        const configDir = normalizePath(path_1.dirname(configFile));
+        const outPath = normalizePath(path_1.normalize(configDir + '/' + outDir));
+        const confDirParentFolderName = path_1.basename(configDir);
+        let hasExtraModule = false;
+        let configDirInOutPath = null;
+        let relConfDirPathInOutPath;
+        const aliases = Object.keys(paths)
+            .map((alias) => {
+            const _paths = paths[alias].map((path) => {
+                path = path.replace(/\*$/, '').replace(/\.ts(x)?$/, '.js$1');
+                if (path_1.isAbsolute(path)) {
+                    path = path_1.relative(configDir, path);
                 }
-                if (configDirInOutPath) {
-                    const stepsbackPath = path_1.relative(configDirInOutPath, outPath);
-                    const splitStepBackPath = normalizePath(stepsbackPath).split('/');
-                    const nbOfStepBack = splitStepBackPath.length;
-                    const splitConfDirInOutPath = configDirInOutPath.split('/');
-                    let i = 1;
-                    const splitRelPath = [];
-                    while (i <= nbOfStepBack) {
-                        splitRelPath.unshift(splitConfDirInOutPath[splitConfDirInOutPath.length - i]);
-                        i++;
+                return path;
+            });
+            const path = _paths[0];
+            const isExtra = null;
+            const basePath = null;
+            if (path_1.normalize(path).includes('..')) {
+                if (!configDirInOutPath) {
+                    configDirInOutPath = helpers_1.getProjectDirPathInOutDir(outPath, confDirParentFolderName);
+                    if (configDirInOutPath) {
+                        hasExtraModule = true;
                     }
-                    relConfDirPathInOutPath = splitRelPath.join('/');
+                    if (configDirInOutPath) {
+                        const stepsbackPath = path_1.relative(configDirInOutPath, outPath);
+                        const splitStepBackPath = normalizePath(stepsbackPath).split('/');
+                        const nbOfStepBack = splitStepBackPath.length;
+                        const splitConfDirInOutPath = configDirInOutPath.split('/');
+                        let i = 1;
+                        const splitRelPath = [];
+                        while (i <= nbOfStepBack) {
+                            splitRelPath.unshift(splitConfDirInOutPath[splitConfDirInOutPath.length - i]);
+                            i++;
+                        }
+                        relConfDirPathInOutPath = splitRelPath.join('/');
+                    }
                 }
             }
-        }
-        let prefix = alias.replace(/\*$/, '');
-        return {
-            shouldPrefixMatchWildly: alias.endsWith('*'),
-            prefix,
-            basePath,
-            path,
-            paths: _paths,
-            isExtra
-        };
-    })
-        .filter(({ prefix }) => prefix)
-        .sort((alias1, alias2) => alias2.prefix.length - alias1.prefix.length);
-    aliases.forEach((alias) => {
-        if (path_1.normalize(alias.path).includes('..')) {
-            const tempBasePath = normalizePath(path_1.normalize(`${configDir}/${outDir}/${hasExtraModule && relConfDirPathInOutPath
-                ? relConfDirPathInOutPath
-                : ''}/${baseUrl}`));
-            const absoluteBasePath = normalizePath(path_1.normalize(`${tempBasePath}/${alias.path}`));
-            if (helpers_1.existsResolvedAlias(absoluteBasePath)) {
+            let prefix = alias.replace(/\*$/, '');
+            return {
+                shouldPrefixMatchWildly: alias.endsWith('*'),
+                prefix,
+                basePath,
+                path,
+                paths: _paths,
+                isExtra
+            };
+        })
+            .filter(({ prefix }) => prefix)
+            .sort((alias1, alias2) => alias2.prefix.length - alias1.prefix.length);
+        aliases.forEach((alias) => {
+            if (path_1.normalize(alias.path).includes('..')) {
+                const tempBasePath = normalizePath(path_1.normalize(`${configDir}/${outDir}/${hasExtraModule && relConfDirPathInOutPath
+                    ? relConfDirPathInOutPath
+                    : ''}/${baseUrl}`));
+                const absoluteBasePath = normalizePath(path_1.normalize(`${tempBasePath}/${alias.path}`));
+                if (helpers_1.existsResolvedAlias(absoluteBasePath)) {
+                    alias.isExtra = false;
+                    alias.basePath = tempBasePath;
+                }
+                else {
+                    alias.isExtra = true;
+                    alias.basePath = absoluteBasePath;
+                }
+            }
+            else if (hasExtraModule) {
                 alias.isExtra = false;
-                alias.basePath = tempBasePath;
+                alias.basePath = normalizePath(path_1.normalize(`${configDir}/${outDir}/${relConfDirPathInOutPath}/${baseUrl}`));
             }
             else {
-                alias.isExtra = true;
-                alias.basePath = absoluteBasePath;
+                alias.basePath = normalizePath(path_1.normalize(`${configDir}/${outDir}`));
+                alias.isExtra = false;
             }
-        }
-        else if (hasExtraModule) {
-            alias.isExtra = false;
-            alias.basePath = normalizePath(path_1.normalize(`${configDir}/${outDir}/${relConfDirPathInOutPath}/${baseUrl}`));
-        }
-        else {
-            alias.basePath = normalizePath(path_1.normalize(`${configDir}/${outDir}`));
-            alias.isExtra = false;
-        }
-    });
-    const replaceImportStatement = ({ orig, file, alias }) => {
-        var _a, _b;
-        const requiredModule = (_b = (_a = orig.match(utils_1.newStringRegex())) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.path;
-        assert(typeof requiredModule == 'string', `Unexpected import statement pattern ${orig}`);
-        const isAlias = alias.shouldPrefixMatchWildly
-            ?
-                requiredModule.startsWith(alias.prefix) &&
-                    requiredModule !== alias.prefix
-            :
-                requiredModule === alias.prefix ||
-                    requiredModule.startsWith(alias.prefix + '/');
-        if (isAlias) {
-            let absoluteAliasPath = helpers_1.getAbsoluteAliasPath(alias.basePath, alias.path);
-            let relativeAliasPath = normalizePath(path_1.relative(path_1.dirname(file), absoluteAliasPath));
-            if (!relativeAliasPath.startsWith('.')) {
-                relativeAliasPath = './' + relativeAliasPath;
+        });
+        const replaceImportStatement = ({ orig, file, alias }) => {
+            var _a, _b;
+            const requiredModule = (_b = (_a = orig.match(utils_1.newStringRegex())) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.path;
+            assert(typeof requiredModule == 'string', `Unexpected import statement pattern ${orig}`);
+            const isAlias = alias.shouldPrefixMatchWildly
+                ?
+                    requiredModule.startsWith(alias.prefix) &&
+                        requiredModule !== alias.prefix
+                :
+                    requiredModule === alias.prefix ||
+                        requiredModule.startsWith(alias.prefix + '/');
+            if (isAlias) {
+                let absoluteAliasPath = helpers_1.getAbsoluteAliasPath(alias.basePath, alias.path);
+                let relativeAliasPath = normalizePath(path_1.relative(path_1.dirname(file), absoluteAliasPath));
+                if (!relativeAliasPath.startsWith('.')) {
+                    relativeAliasPath = './' + relativeAliasPath;
+                }
+                const index = orig.indexOf(alias.prefix);
+                const newImportScript = orig.substring(0, index) +
+                    relativeAliasPath +
+                    '/' +
+                    orig.substring(index + alias.prefix.length);
+                const modulePath = newImportScript.match(utils_1.newStringRegex()).groups.path;
+                return newImportScript.replace(modulePath, normalizePath(modulePath));
             }
-            const index = orig.indexOf(alias.prefix);
-            const newImportScript = orig.substring(0, index) +
-                relativeAliasPath +
-                '/' +
-                orig.substring(index + alias.prefix.length);
-            const modulePath = newImportScript.match(utils_1.newStringRegex()).groups.path;
-            return newImportScript.replace(modulePath, normalizePath(modulePath));
+            return orig;
+        };
+        const replaceAlias = (file, resolveFullPath) => __awaiter(this, void 0, void 0, function* () {
+            const code = yield fs_1.promises.readFile(file, 'utf8');
+            let tempCode = code;
+            for (const alias of aliases) {
+                const replacementParams = {
+                    file,
+                    alias
+                };
+                tempCode = utils_1.replaceSourceImportPaths(tempCode, file, (orig) => replaceImportStatement(Object.assign({ orig }, replacementParams)));
+            }
+            if (resolveFullPath) {
+                tempCode = utils_1.resolveFullImportPaths(tempCode, file);
+            }
+            if (code !== tempCode) {
+                yield fs_1.promises.writeFile(file, tempCode, 'utf8');
+                return true;
+            }
+            return false;
+        });
+        const globPattern = [
+            `${outPath}/**/*.{js,jsx,d.ts,d.tsx}`,
+            `!${outPath}/**/node_modules`
+        ];
+        const files = globby_1.sync(globPattern, {
+            dot: true,
+            onlyFiles: true
+        });
+        const replaceList = yield Promise.all(files.map((file) => replaceAlias(file, options === null || options === void 0 ? void 0 : options.resolveFullPaths)));
+        const replaceCount = replaceList.reduce((prev, curr) => (curr ? ++prev : prev), 0);
+        output.info(`${replaceCount} files were affected!`);
+        if (options.watch) {
+            output.info('[Watching for file changes...]');
+            const filesWatcher = chokidar_1.watch(globPattern);
+            const tsconfigWatcher = chokidar_1.watch(configFile);
+            filesWatcher.on('change', (file) => __awaiter(this, void 0, void 0, function* () {
+                yield replaceAlias(file, options === null || options === void 0 ? void 0 : options.resolveFullPaths);
+            }));
+            tsconfigWatcher.on('change', (_) => {
+                output.clear();
+                filesWatcher.close();
+                tsconfigWatcher.close();
+                replaceTscAliasPaths(options);
+            });
         }
-        return orig;
-    };
-    const replaceAlias = (file, resolveFullPath) => {
-        const code = fs_1.readFileSync(file, 'utf8');
-        let tempCode = code;
-        for (const alias of aliases) {
-            const replacementParams = {
-                file,
-                alias
-            };
-            tempCode = utils_1.replaceSourceImportPaths(tempCode, file, (orig) => replaceImportStatement(Object.assign({ orig }, replacementParams)));
-        }
-        if (resolveFullPath) {
-            tempCode = utils_1.resolveFullImportPaths(tempCode, file);
-        }
-        if (code !== tempCode) {
-            fs_1.writeFileSync(file, tempCode, 'utf8');
-            return true;
-        }
-        return false;
-    };
-    const globPattern = [
-        `${outPath}/**/*.{js,jsx,d.ts,d.tsx}`,
-        `!${outPath}/**/node_modules`
-    ];
-    const files = globby_1.sync(globPattern, {
-        dot: true,
-        onlyFiles: true
     });
-    const flen = files.length;
-    let replaceCount = 0;
-    for (let i = 0; i < flen; i += 1) {
-        const file = files[i];
-        if (replaceAlias(file, options === null || options === void 0 ? void 0 : options.resolveFullPaths)) {
-            replaceCount++;
-        }
-    }
-    output.info(`${replaceCount} files were affected!`);
-    if (options.watch) {
-        output.info('[Watching for file changes...]');
-        const filesWatcher = chokidar_1.watch(globPattern);
-        const tsconfigWatcher = chokidar_1.watch(configFile);
-        filesWatcher.on('change', (file) => {
-            replaceAlias(file, options === null || options === void 0 ? void 0 : options.resolveFullPaths);
-        });
-        tsconfigWatcher.on('change', (_) => {
-            output.clear();
-            filesWatcher.close();
-            tsconfigWatcher.close();
-            replaceTscAliasPaths(options);
-        });
-    }
 }
 exports.replaceTscAliasPaths = replaceTscAliasPaths;
 //# sourceMappingURL=index.js.map

package.json

 {
   "name": "tsc-alias",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "description": "Replace alias paths with relative paths after typescript compilation.",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

58507

increased by3.21%

Lines of code

496

increased by1.02%

No dependency changes