vite-plugin-lib 1.3.0 → 1.5.0

package/dist/index.cjs

@@ -6,8 +6,8 @@ const node_module = require('node:module');
 const path = require('node:path');
 const c = require('picocolors');
 const ts = require('typescript');
-const vite = require('vite');
 const dts = require('vite-plugin-dts');
+const vite = require('vite');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -29,7 +29,6 @@ const ts__default = /*#__PURE__*/_interopDefaultCompat(ts);
 const dts__default = /*#__PURE__*/_interopDefaultCompat(dts);
 const dts__namespace = /*#__PURE__*/_interopNamespaceCompat(dts);
 
-const typesDir = "dist/types";
 function log(text) {
   console.log(`${c__default.cyan("[vite:lib]")} ${text}`);
 }
@@ -39,6 +38,52 @@ function logWarn(text) {
 function logError(text) {
   console.error(`${c__default.red("[vite:lib]")} ${text}`);
 }
+
+async function generateMTSDeclarations(typesDir) {
+  const files = await collectFiles(typesDir);
+  for (const file of files) {
+    await createMTSImports(file);
+  }
+  log(`Generated ${files.length} MTS declarations.`);
+}
+async function collectFiles(dir) {
+  const entries = await promises.readdir(dir, {
+    recursive: false,
+    // does not provide full path to nested files
+    withFileTypes: true
+  });
+  const files = entries.filter((entry) => entry.isFile());
+  const nestedFiles = await Promise.all(
+    entries.filter((entry) => entry.isDirectory()).map((entry) => collectFiles(vite.normalizePath(path__default.join(dir, entry.name))))
+  );
+  return files.map((file) => vite.normalizePath(path__default.join(dir, file.name))).concat(...nestedFiles);
+}
+async function createMTSImports(file) {
+  const content = await promises.readFile(file, "utf-8");
+  const lines = content.split("\n");
+  const modified = lines.map(transformLine);
+  const targetFile = file.replace(".d.ts", ".d.mts");
+  await promises.writeFile(targetFile, modified.join("\n"));
+}
+function transformLine(line) {
+  return transformStaticImport(line, "'") ?? transformStaticImport(line, '"') ?? transformExport(line, "'") ?? transformExport(line, '"') ?? line;
+}
+function transformStaticImport(line, quote) {
+  const isStaticImport = line.includes("import ") && line.includes(`from ${quote}.`);
+  if (!isStaticImport) {
+    return void 0;
+  }
+  return `${line.substring(0, line.length - 2)}.mjs${quote};`;
+}
+function transformExport(line, quote) {
+  const isStaticExport = line.includes("export ") && line.includes(` from ${quote}.`);
+  if (!isStaticExport) {
+    return void 0;
+  }
+  return `${line.substring(0, line.length - 2)}.mjs${quote};`;
+}
+
+const typesDir = "dist/types";
 function tsconfigPaths({ verbose } = {}) {
   return {
     name: "vite-plugin-lib:alias",
@@ -179,7 +224,7 @@ function library(options) {
       include: `${path__default.resolve(options.entry, "..")}/**`,
       outDir: typesDir,
       staticImport: true,
-      afterBuild: includesESFormat(options.formats) ? () => copyMTSDeclaration(options) : void 0
+      afterBuild: includesESFormat(options.formats) ? () => generateMTSDeclarations(typesDir) : void 0
     })
   ];
 }
@@ -222,26 +267,6 @@ function getErrorMessage(error) {
   const isObject = typeof error === "object" && error !== null && "message" in error;
   return isObject ? error.message : String(error);
 }
-async function copyMTSDeclaration(options) {
-  const declarationFile = options.entry.replace(".ts", ".d.ts").substring(options.entry.lastIndexOf("/") + 1);
-  const mtsDeclarationFile = declarationFile.replace(".ts", ".mts");
-  const sourceDeclaration = vite.normalizePath(
-    path__default.resolve(typesDir, declarationFile)
-  );
-  const targetDeclaration = vite.normalizePath(
-    path__default.resolve(typesDir, mtsDeclarationFile)
-  );
-  log(
-    `Creating mts declaration file ${mtsDeclarationFile} based on ${declarationFile}`
-  );
-  try {
-    await promises.copyFile(sourceDeclaration, targetDeclaration);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    logError(`Could not create mts declaration file: ${message}`);
-    throw error;
-  }
-}
 
 exports.dts = dts__namespace;
 exports.library = library;

package/dist/index.mjs

@@ -1,15 +1,14 @@
 import { existsSync } from 'node:fs';
-import { readFile, copyFile } from 'node:fs/promises';
+import { readdir, readFile, writeFile } from 'node:fs/promises';
 import { builtinModules } from 'node:module';
 import path from 'node:path';
 import c from 'picocolors';
 import ts from 'typescript';
-import { normalizePath } from 'vite';
 import dts__default from 'vite-plugin-dts';
 import * as dts from 'vite-plugin-dts';
 export { dts };
+import { normalizePath } from 'vite';
 
-const typesDir = "dist/types";
 function log(text) {
   console.log(`${c.cyan("[vite:lib]")} ${text}`);
 }
@@ -19,6 +18,52 @@ function logWarn(text) {
 function logError(text) {
   console.error(`${c.red("[vite:lib]")} ${text}`);
 }
+
+async function generateMTSDeclarations(typesDir) {
+  const files = await collectFiles(typesDir);
+  for (const file of files) {
+    await createMTSImports(file);
+  }
+  log(`Generated ${files.length} MTS declarations.`);
+}
+async function collectFiles(dir) {
+  const entries = await readdir(dir, {
+    recursive: false,
+    // does not provide full path to nested files
+    withFileTypes: true
+  });
+  const files = entries.filter((entry) => entry.isFile());
+  const nestedFiles = await Promise.all(
+    entries.filter((entry) => entry.isDirectory()).map((entry) => collectFiles(normalizePath(path.join(dir, entry.name))))
+  );
+  return files.map((file) => normalizePath(path.join(dir, file.name))).concat(...nestedFiles);
+}
+async function createMTSImports(file) {
+  const content = await readFile(file, "utf-8");
+  const lines = content.split("\n");
+  const modified = lines.map(transformLine);
+  const targetFile = file.replace(".d.ts", ".d.mts");
+  await writeFile(targetFile, modified.join("\n"));
+}
+function transformLine(line) {
+  return transformStaticImport(line, "'") ?? transformStaticImport(line, '"') ?? transformExport(line, "'") ?? transformExport(line, '"') ?? line;
+}
+function transformStaticImport(line, quote) {
+  const isStaticImport = line.includes("import ") && line.includes(`from ${quote}.`);
+  if (!isStaticImport) {
+    return void 0;
+  }
+  return `${line.substring(0, line.length - 2)}.mjs${quote};`;
+}
+function transformExport(line, quote) {
+  const isStaticExport = line.includes("export ") && line.includes(` from ${quote}.`);
+  if (!isStaticExport) {
+    return void 0;
+  }
+  return `${line.substring(0, line.length - 2)}.mjs${quote};`;
+}
+
+const typesDir = "dist/types";
 function tsconfigPaths({ verbose } = {}) {
   return {
     name: "vite-plugin-lib:alias",
@@ -159,7 +204,7 @@ function library(options) {
       include: `${path.resolve(options.entry, "..")}/**`,
       outDir: typesDir,
       staticImport: true,
-      afterBuild: includesESFormat(options.formats) ? () => copyMTSDeclaration(options) : void 0
+      afterBuild: includesESFormat(options.formats) ? () => generateMTSDeclarations(typesDir) : void 0
     })
   ];
 }
@@ -202,25 +247,5 @@ function getErrorMessage(error) {
   const isObject = typeof error === "object" && error !== null && "message" in error;
   return isObject ? error.message : String(error);
 }
-async function copyMTSDeclaration(options) {
-  const declarationFile = options.entry.replace(".ts", ".d.ts").substring(options.entry.lastIndexOf("/") + 1);
-  const mtsDeclarationFile = declarationFile.replace(".ts", ".mts");
-  const sourceDeclaration = normalizePath(
-    path.resolve(typesDir, declarationFile)
-  );
-  const targetDeclaration = normalizePath(
-    path.resolve(typesDir, mtsDeclarationFile)
-  );
-  log(
-    `Creating mts declaration file ${mtsDeclarationFile} based on ${declarationFile}`
-  );
-  try {
-    await copyFile(sourceDeclaration, targetDeclaration);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    logError(`Could not create mts declaration file: ${message}`);
-    throw error;
-  }
-}
 
 export { library, tsconfigPaths };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-lib",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "Vite plugin for build configuration, automatic aliases, and type declarations.",
   "author": "Jan Müller <janmueller3698@gmail.com>",
   "license": "MIT",