@modern-js/module-tools 2.41.0 → 2.42.1

package/dist/utils/dts.js

@@ -28,69 +28,25 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var dts_exports = {};
 __export(dts_exports, {
-  addBannerAndFooter: () => addBannerAndFooter,
-  generateDtsInfo: () => generateDtsInfo,
   getProjectTsconfig: () => getProjectTsconfig,
   getTscBinPath: () => getTscBinPath,
   printOrThrowDtsErrors: () => printOrThrowDtsErrors,
-  resolveAlias: () => resolveAlias,
-  tsTargetAtOrAboveES2022: () => tsTargetAtOrAboveES2022,
-  writeDtsFiles: () => writeDtsFiles
+  processDtsFilesAfterTsc: () => processDtsFilesAfterTsc,
+  tsTargetAtOrAboveES2022: () => tsTargetAtOrAboveES2022
 });
 module.exports = __toCommonJS(dts_exports);
 var import_path = require("path");
 var import_utils = require("@modern-js/utils");
 var import_magic_string = __toESM(require("magic-string"));
+var import_tsconfig_paths = require("@modern-js/utils/tsconfig-paths");
+var import_napi = require("@ast-grep/napi");
+var import_builder = require("./builder");
 const getProjectTsconfig = async (tsconfigPath) => {
   if (!import_utils.fs.existsSync(tsconfigPath)) {
     return {};
   }
   return import_utils.json5.parse(import_utils.fs.readFileSync(tsconfigPath, "utf-8"));
 };
-const generateDtsInfo = async (config) => {
-  var _userTsconfig_references;
-  const { appDirectory, sourceDir: absSourceDir, tsconfigPath } = config;
-  const userTsconfig = await getProjectTsconfig(tsconfigPath);
-  const { dtsTempDirectory } = await Promise.resolve().then(() => __toESM(require("../constants/dts")));
-  const tempDistAbsRootPath = (0, import_path.join)(appDirectory, `${dtsTempDirectory}/${(0, import_utils.nanoid)()}`);
-  const tempDistAbsOurDir = (0, import_path.join)(tempDistAbsRootPath, (0, import_path.relative)(appDirectory, absSourceDir));
-  const tempTsconfigPath = (0, import_path.join)(tempDistAbsRootPath, (0, import_path.basename)(tsconfigPath));
-  import_utils.fs.ensureFileSync(tempTsconfigPath);
-  const extendsPath = (0, import_path.join)((0, import_path.relative)((0, import_path.dirname)(tempTsconfigPath), (0, import_path.dirname)(tsconfigPath)), (0, import_path.basename)(tempTsconfigPath));
-  const references = userTsconfig === null || userTsconfig === void 0 ? void 0 : (_userTsconfig_references = userTsconfig.references) === null || _userTsconfig_references === void 0 ? void 0 : _userTsconfig_references.map((reference) => {
-    const { path } = reference;
-    if (path) {
-      const userTsconfigDir = (0, import_path.dirname)(tsconfigPath);
-      const generatedTsconfigDir = (0, import_path.dirname)(tempTsconfigPath);
-      return {
-        path: (0, import_path.isAbsolute)(path) ? path : (0, import_path.relative)(generatedTsconfigDir, (0, import_path.resolve)(userTsconfigDir, path))
-      };
-    }
-    return reference;
-  });
-  const resetConfig = {
-    extends: extendsPath,
-    compilerOptions: {
-      // Ensure that .d.ts files are created by tsc, but not .js files
-      declaration: true,
-      emitDeclarationOnly: true,
-      // when `outDir` is './dist', `declarationDir` is `./types`
-      // tsc will emit:
-      // - ./dist/index.js
-      // - ./types/index.d.ts
-      // we only want to emit declarations
-      declarationDir: tempDistAbsOurDir
-    },
-    references
-  };
-  import_utils.fs.writeJSONSync(tempTsconfigPath, resetConfig);
-  return {
-    userTsconfig,
-    tempTsconfigPath,
-    tempDistAbsRootPath,
-    tempDistAbsSrcPath: tempDistAbsOurDir
-  };
-};
 const getTscBinPath = async (appDirectory) => {
   const { default: findUp, exists: pathExists } = await Promise.resolve().then(() => __toESM(require("../../compiled/find-up")));
   const tscBinFile = await findUp(async (directory) => {
@@ -108,58 +64,83 @@ const getTscBinPath = async (appDirectory) => {
   }
   return tscBinFile;
 };
-const resolveAlias = async (config, options, watchFilenames = []) => {
-  var _userTsconfig_compilerOptions;
-  const { userTsconfig, tempDistAbsSrcPath, tempDistAbsRootPath } = options;
-  const { transformDtsAlias } = await Promise.resolve().then(() => __toESM(require("./tspath")));
-  const dtsDistPath = `${(0, import_utils.slash)(tempDistAbsSrcPath)}/**/*.d.ts`;
-  const dtsFilenames = watchFilenames.length > 0 ? watchFilenames : import_utils.globby.sync(dtsDistPath, {
-    absolute: true
-  });
-  var _userTsconfig_compilerOptions_paths;
-  const result = transformDtsAlias({
-    filenames: dtsFilenames,
-    baseUrl: tempDistAbsRootPath,
-    paths: (_userTsconfig_compilerOptions_paths = (_userTsconfig_compilerOptions = userTsconfig.compilerOptions) === null || _userTsconfig_compilerOptions === void 0 ? void 0 : _userTsconfig_compilerOptions.paths) !== null && _userTsconfig_compilerOptions_paths !== void 0 ? _userTsconfig_compilerOptions_paths : {}
+const processDtsFilesAfterTsc = async (config) => {
+  const { distPath, tsconfigPath, userTsconfig, dtsExtension, banner, footer } = config;
+  const dtsFilesPath = await (0, import_utils.globby)("**/*.d.ts", {
+    absolute: true,
+    cwd: distPath
   });
-  return result;
-};
-const writeDtsFiles = async (config, options, result) => {
-  const { distPath, dtsExtension } = config;
-  const { tempDistAbsSrcPath } = options;
-  await Promise.all(result.map(({ path, content }) => {
-    const relativePath = (0, import_path.relative)(tempDistAbsSrcPath, path);
-    const filepath = (0, import_path.join)(
-      distPath,
+  const result = (0, import_tsconfig_paths.loadConfig)(tsconfigPath);
+  if (result.resultType === "failed") {
+    import_utils.logger.error(result.message);
+    return;
+  }
+  const { absoluteBaseUrl, paths, mainFields, addMatchAll } = result;
+  const matchPath = (0, import_tsconfig_paths.createMatchPath)(absoluteBaseUrl, paths, mainFields, addMatchAll);
+  const Pattern = [
+    `import $VAR from '$MATCH'`,
+    `import $VAR from "$MATCH"`,
+    `export {$$$VAR} from '$MATCH'`,
+    `export {$$$VAR} from "$MATCH"`,
+    `export * from '$MATCH'`,
+    `export * from "$MATCH"`,
+    `export * as $VAR from '$MATCH'`,
+    `export * as $VAR from "$MATCH"`,
+    `import('$MATCH')`,
+    `import("$MATCH")`
+  ];
+  await Promise.all(dtsFilesPath.map((filePath) => {
+    var _userTsconfig_compilerOptions;
+    const code = import_utils.fs.readFileSync(filePath, "utf8");
+    let matchModule = [];
+    try {
+      const sgNode = import_napi.ts.parse(code).root();
+      matchModule = Pattern.map((p) => sgNode.findAll(p)).flat().map((node) => {
+        const matchNode = node.getMatch("MATCH");
+        return {
+          name: matchNode.text(),
+          start: matchNode.range().start.index,
+          end: matchNode.range().end.index
+        };
+      });
+    } catch (e) {
+      import_utils.logger.error("[parse error]", e);
+    }
+    const str = new import_magic_string.default(code);
+    const originalFilePath = (0, import_path.resolve)(absoluteBaseUrl, (userTsconfig === null || userTsconfig === void 0 ? void 0 : (_userTsconfig_compilerOptions = userTsconfig.compilerOptions) === null || _userTsconfig_compilerOptions === void 0 ? void 0 : _userTsconfig_compilerOptions.rootDir) || "src", (0, import_path.relative)(distPath, filePath));
+    matchModule.forEach((module2) => {
+      if (!module2.name) {
+        return;
+      }
+      const { start, end, name } = module2;
+      const absoluteImportPath = matchPath(name);
+      if (absoluteImportPath) {
+        const relativePath = (0, import_path.relative)((0, import_path.dirname)(originalFilePath), absoluteImportPath);
+        const relativeImportPath = (0, import_builder.normalizeSlashes)(relativePath.startsWith("..") ? relativePath : `./${relativePath}`);
+        str.overwrite(start, end, relativeImportPath);
+      }
+    });
+    banner && str.prepend(`${banner}
+`);
+    footer && str.append(`
+${footer}
+`);
+    const content = str.toString();
+    const finalPath = (
       // We confirm that users will not mix ts and c(m)ts files in their projects.
       // If a mix is required, please configure separate buildConfig to handle different inputs.
       // So we don't replace .d.(c|m)ts that generated by tsc directly, this can confirm that
       // users can use c(m)ts directly rather than enable autoExtension, in this condition,
       // users need to set esbuild out-extensions like { '.js': '.mjs' }
-      relativePath.replace(/\.d\.ts/, dtsExtension)
+      filePath.replace(/\.d\.ts/, dtsExtension)
     );
-    import_utils.fs.ensureFileSync(filepath);
     return import_utils.fs.writeFile(
       // only replace .d.ts, if tsc generate .d.m(c)ts, keep.
-      filepath,
+      finalPath,
       content
     );
   }));
 };
-const addBannerAndFooter = (result, banner, footer) => {
-  return result.map(({ path, content }) => {
-    const ms = new import_magic_string.default(content);
-    banner && ms.prepend(`${banner}
-`);
-    footer && ms.append(`
-${footer}
-`);
-    return {
-      path,
-      content: ms.toString()
-    };
-  });
-};
 const printOrThrowDtsErrors = async (error, options) => {
   const { InternalDTSError } = await Promise.resolve().then(() => __toESM(require("../error")));
   const local = await Promise.resolve().then(() => __toESM(require("../locale")));
@@ -180,12 +161,9 @@ const printOrThrowDtsErrors = async (error, options) => {
 const tsTargetAtOrAboveES2022 = (target) => target === "es2022" || target === "esnext";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  addBannerAndFooter,
-  generateDtsInfo,
   getProjectTsconfig,
   getTscBinPath,
   printOrThrowDtsErrors,
-  resolveAlias,
-  tsTargetAtOrAboveES2022,
-  writeDtsFiles
+  processDtsFilesAfterTsc,
+  tsTargetAtOrAboveES2022
 });

package/dist/utils/hash.d.ts

@@ -1,2 +1,2 @@
 /// <reference types="node" />
-export declare function getHash(content: Buffer | string, encoding: any, type?: string): string;
+export declare function getHash(content: Buffer | string, encoding: any, type?: string): string;

package/dist/utils/index.d.ts

@@ -8,5 +8,4 @@ export * from './log';
 export * from './map';
 export * from './print';
 export * from './style';
-export * from './tspath';
-export * from './outExtension';
+export * from './outExtension';

package/dist/utils/index.js

@@ -25,7 +25,6 @@ __reExport(utils_exports, require("./log"), module.exports);
 __reExport(utils_exports, require("./map"), module.exports);
 __reExport(utils_exports, require("./print"), module.exports);
 __reExport(utils_exports, require("./style"), module.exports);
-__reExport(utils_exports, require("./tspath"), module.exports);
 __reExport(utils_exports, require("./outExtension"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -39,6 +38,5 @@ __reExport(utils_exports, require("./outExtension"), module.exports);
   ...require("./map"),
   ...require("./print"),
   ...require("./style"),
-  ...require("./tspath"),
   ...require("./outExtension")
 });

package/dist/utils/input.d.ts

@@ -1,11 +1,8 @@
 import { Input } from '../types';
-export declare const getDefaultIndexEntry: ({
-  isTsProject,
-  appDirectory
-}: {
-  isTsProject: boolean;
-  appDirectory: string;
+export declare const getDefaultIndexEntry: ({ isTsProject, appDirectory, }: {
+    isTsProject: boolean;
+    appDirectory: string;
 }) => Promise<string[]>;
 export declare const normalizeInput: (input: Input, appDirectory: string, enableSvgr: boolean) => Promise<string[] | {
-  [name: string]: string;
-}>;
+    [name: string]: string;
+}>;

package/dist/utils/log.d.ts

@@ -1 +1 @@
-export declare const withLogTitle: (titleText: string, message: string) => string;
+export declare const withLogTitle: (titleText: string, message: string) => string;

package/dist/utils/map.d.ts

@@ -1,13 +1,13 @@
 import { RawSourceMap } from '@ampproject/remapping/dist/types/types';
 import type { SourceMap } from '../types';
 interface Options {
-  needSourceMap: boolean;
+    needSourceMap: boolean;
 }
 export declare function normalizeSourceMap(map: string | RawSourceMap | undefined, opts?: Options): SourceMap | undefined;
 export type MergeMapResult = {
-  toString: () => string;
-  toMap: () => SourceMap;
-  toComment: () => string;
+    toString: () => string;
+    toMap: () => SourceMap;
+    toComment: () => string;
 };
 export declare function mergeMaps(mapList: SourceMap[]): MergeMapResult;
-export {};
+export {};

package/dist/utils/onExit.d.ts

@@ -1 +1 @@
-export declare const addExitListener: (fn: () => Promise<void>) => Promise<void>;
+export declare const addExitListener: (fn: () => Promise<void>) => Promise<void>;

package/dist/utils/outExtension.d.ts

@@ -1,9 +1,9 @@
 import type { Format } from '../types';
 export declare const getDefaultOutExtension: (options: {
-  format: Format;
-  root: string;
-  autoExtension: boolean;
+    format: Format;
+    root: string;
+    autoExtension: boolean;
 }) => {
-  jsExtension: string;
-  dtsExtension: string;
-};
+    jsExtension: string;
+    dtsExtension: string;
+};

package/dist/utils/print.d.ts

@@ -1,8 +1,8 @@
 import type { RollupOutput } from '../../compiled/rollup/types/rollup';
 import { Chunk } from '../types';
 type Files = {
-  name: string;
-  size: number;
+    name: string;
+    size: number;
 };
 export declare const bundleFiles: Files[];
 export declare const bundlelessFiles: Files[];
@@ -11,4 +11,4 @@ export declare const addRollupChunk: (rollupOutput: RollupOutput, appDirectory:
 export declare const addDtsFiles: (distDir: string, appDirectory: string) => Promise<void>;
 export declare const printFileSize: () => void;
 export declare const printSucceed: (totalDuration: number) => void;
-export {};
+export {};

package/dist/utils/style.d.ts

@@ -2,12 +2,12 @@ import type { PartialBaseBuildConfig, PostcssOptions, LessOptions, SassOptions }
 export declare const getLessConfig: (config: PartialBaseBuildConfig) => Promise<LessOptions>;
 export declare const getSassConfig: (config: PartialBaseBuildConfig) => Promise<SassOptions>;
 export declare const getPostcssConfig: (config: PartialBaseBuildConfig) => Promise<PostcssOptions & {
-  $$tools?: string | undefined;
+    $$tools?: string | undefined;
 }>;
 export declare const getStyleConfig: (config: PartialBaseBuildConfig) => Promise<{
-  less: LessOptions;
-  sass: SassOptions;
-  postcss: PostcssOptions & {
-    $$tools?: string | undefined;
-  };
-}>;
+    less: LessOptions;
+    sass: SassOptions;
+    postcss: PostcssOptions & {
+        $$tools?: string | undefined;
+    };
+}>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.41.0",
+  "version": "2.42.1",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -48,10 +48,6 @@
   "dependencies": {
     "@ampproject/remapping": "1.0.2",
     "@ast-grep/napi": "0.12.0",
-    "@babel/generator": "^7.22.15",
-    "@babel/parser": "^7.22.15",
-    "@babel/traverse": "^7.23.2",
-    "@babel/types": "^7.22.15",
     "@modern-js/swc-plugins": "0.6.5",
     "@rollup/pluginutils": "4.1.1",
     "@svgr/core": "8.0.0",
@@ -71,26 +67,24 @@
     "tapable": "2.2.1",
     "terser": "5.19.2",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@modern-js/new-action": "2.41.0",
-    "@modern-js/core": "2.41.0",
-    "@modern-js/plugin-changeset": "2.41.0",
-    "@modern-js/plugin": "2.41.0",
-    "@modern-js/plugin-i18n": "2.41.0",
-    "@modern-js/plugin-lint": "2.41.0",
-    "@modern-js/types": "2.41.0",
-    "@modern-js/utils": "2.41.0",
-    "@modern-js/upgrade": "2.41.0"
+    "@modern-js/core": "2.42.1",
+    "@modern-js/new-action": "2.42.1",
+    "@modern-js/plugin": "2.42.1",
+    "@modern-js/plugin-i18n": "2.42.1",
+    "@modern-js/plugin-changeset": "2.42.1",
+    "@modern-js/types": "2.42.1",
+    "@modern-js/upgrade": "2.42.1",
+    "@modern-js/utils": "2.42.1",
+    "@modern-js/plugin-lint": "2.42.1"
   },
   "devDependencies": {
-    "@types/babel__generator": "7.6.4",
-    "@types/babel__traverse": "7.18.5",
     "@types/convert-source-map": "1.5.2",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/builder-webpack-provider": "2.41.0",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.41.0",
-    "@scripts/vitest-config": "2.41.0",
-    "@scripts/build": "2.41.0"
+    "@modern-js/self": "npm:@modern-js/module-tools@2.42.1",
+    "@modern-js/builder-webpack-provider": "2.42.1",
+    "@scripts/build": "2.42.1",
+    "@scripts/vitest-config": "2.42.1"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"

package/dist/utils/tspath.d.ts

@@ -1,15 +0,0 @@
-export interface TransformOption {
-  filename: string;
-  baseUrl: string;
-  paths: Record<string, string[] | string>;
-}
-interface TransformDtsAliasOption {
-  filenames?: string[];
-  baseUrl: string;
-  paths: Record<string, string[] | string>;
-}
-export declare const transformDtsAlias: (option: TransformDtsAliasOption) => {
-  path: string;
-  content: string;
-}[];
-export {};

package/dist/utils/tspath.js

@@ -1,114 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var tspath_exports = {};
-__export(tspath_exports, {
-  transformDtsAlias: () => transformDtsAlias
-});
-module.exports = __toCommonJS(tspath_exports);
-var path = __toESM(require("path"));
-var import_tsconfig_paths = require("@modern-js/utils/tsconfig-paths");
-var import_utils = require("@modern-js/utils");
-var parser = __toESM(require("@babel/parser"));
-var import_generator = __toESM(require("@babel/generator"));
-var t = __toESM(require("@babel/types"));
-var import_traverse = __toESM(require("@babel/traverse"));
-var import_file = require("../constants/file");
-function mapPathString(nodePath, { filename, baseUrl, paths }) {
-  if (!t.isStringLiteral(nodePath)) {
-    return;
-  }
-  const sourcePath = nodePath.node.value;
-  const currentFile = filename;
-  const matchPath = (0, import_tsconfig_paths.createMatchPath)(baseUrl, paths, [
-    "index"
-  ]);
-  const result = matchPath(sourcePath, (packageJsonPath) => {
-    if (!import_utils.fs.existsSync(packageJsonPath)) {
-      return void 0;
-    }
-    return import_utils.fs.readJSONSync(packageJsonPath);
-  }, (filePath) => import_utils.fs.existsSync(filePath), import_file.dtsAliasExts);
-  if (result) {
-    const relativePath = path.relative(path.dirname(currentFile), path.dirname(result));
-    const fileName = path.basename(result);
-    const filePath = path.normalize(`${relativePath.length === 0 ? "." : relativePath}/${fileName}`);
-    const replaceString = filePath.startsWith(".") ? filePath : `./${filePath}`;
-    nodePath.replaceWith(t.stringLiteral(replaceString));
-  }
-}
-const transformImport = (option) => (nodePath) => {
-  mapPathString(nodePath.get("source"), option);
-};
-const transformExport = (option) => (nodePath) => {
-  mapPathString(nodePath.get("source"), option);
-};
-const transformSingleFileAlias = ({ filename, baseUrl, paths }) => {
-  const sourceCode = import_utils.fs.readFileSync(filename, "utf-8");
-  const ast = parser.parse(sourceCode, {
-    sourceType: "module",
-    errorRecovery: true,
-    plugins: [
-      "typescript"
-    ]
-  });
-  (0, import_traverse.default)(ast, {
-    // d.ts file content not have callExpression which can be parsed;
-    // CallExpression: transformCall({ filename, baseUrl, paths }) as any,
-    ImportDeclaration: transformImport({
-      filename,
-      baseUrl,
-      paths
-    }),
-    ExportDeclaration: transformExport({
-      filename,
-      baseUrl,
-      paths
-    })
-  });
-  return (0, import_generator.default)(ast).code;
-};
-const transformDtsAlias = (option) => {
-  const { filenames = [], baseUrl, paths } = option;
-  const transformResult = [];
-  for (const filename of filenames) {
-    transformResult.push({
-      path: filename,
-      content: transformSingleFileAlias({
-        filename,
-        baseUrl,
-        paths
-      })
-    });
-  }
-  return transformResult;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  transformDtsAlias
-});