vite-plugin-lib 1.2.3 → 1.4.0

package/dist/index.cjs

@@ -7,6 +7,7 @@ const path = require('node:path');
 const c = require('picocolors');
 const ts = require('typescript');
 const dts = require('vite-plugin-dts');
+const vite = require('vite');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -37,6 +38,46 @@ 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) {
+  const isStaticImport = line.includes("import ") && line.includes(`from '.`);
+  if (isStaticImport) {
+    return `${line.substring(0, line.length - 2)}.d.mts';`;
+  }
+  const isStaticExport = line.includes("export ") && line.includes(` from '.`);
+  if (isStaticExport) {
+    return `${line.substring(0, line.length - 2)}.mjs';`;
+  }
+  return line;
+}
+
+const typesDir = "dist/types";
 function tsconfigPaths({ verbose } = {}) {
   return {
     name: "vite-plugin-lib:alias",
@@ -175,8 +216,9 @@ function library(options) {
       cleanVueFileName: true,
       copyDtsFiles: true,
       include: `${path__default.resolve(options.entry, "..")}/**`,
-      outDir: "dist/types",
-      staticImport: true
+      outDir: typesDir,
+      staticImport: true,
+      afterBuild: includesESFormat(options.formats) ? () => generateMTSDeclarations(typesDir) : void 0
     })
   ];
 }
@@ -207,11 +249,18 @@ async function readConfig(configPath) {
     );
     return options;
   } catch (error) {
-    const message = "message" in error ? error.message : error;
+    const message = getErrorMessage(error);
     logError(`Could not read tsconfig.json: ${message}`);
     throw error;
   }
 }
+function includesESFormat(formats) {
+  return formats?.includes("es") ?? true;
+}
+function getErrorMessage(error) {
+  const isObject = typeof error === "object" && error !== null && "message" in error;
+  return isObject ? error.message : String(error);
+}
 
 exports.dts = dts__namespace;
 exports.library = library;

package/dist/index.d.cts

@@ -0,0 +1,15 @@
+import { LibraryFormats, Plugin } from 'vite';
+import * as vitePluginDts from 'vite-plugin-dts';
+export { vitePluginDts as dts };
+
+interface Options {
+    name: string;
+    entry: string;
+    formats?: LibraryFormats[];
+    externalPackages?: (string | RegExp)[];
+    verbose?: boolean;
+}
+declare function tsconfigPaths({ verbose }?: Partial<Options>): Plugin;
+declare function library(options: Options): Plugin[];
+
+export { Options, library, tsconfigPaths };

package/dist/index.d.mts

@@ -0,0 +1,15 @@
+import { LibraryFormats, Plugin } from 'vite';
+import * as vitePluginDts from 'vite-plugin-dts';
+export { vitePluginDts as dts };
+
+interface Options {
+    name: string;
+    entry: string;
+    formats?: LibraryFormats[];
+    externalPackages?: (string | RegExp)[];
+    verbose?: boolean;
+}
+declare function tsconfigPaths({ verbose }?: Partial<Options>): Plugin;
+declare function library(options: Options): Plugin[];
+
+export { Options, library, tsconfigPaths };

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { existsSync } from 'node:fs';
-import { readFile } 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';
@@ -7,6 +7,7 @@ import ts from 'typescript';
 import dts__default from 'vite-plugin-dts';
 import * as dts from 'vite-plugin-dts';
 export { dts };
+import { normalizePath } from 'vite';
 
 function log(text) {
   console.log(`${c.cyan("[vite:lib]")} ${text}`);
@@ -17,6 +18,46 @@ 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) {
+  const isStaticImport = line.includes("import ") && line.includes(`from '.`);
+  if (isStaticImport) {
+    return `${line.substring(0, line.length - 2)}.d.mts';`;
+  }
+  const isStaticExport = line.includes("export ") && line.includes(` from '.`);
+  if (isStaticExport) {
+    return `${line.substring(0, line.length - 2)}.mjs';`;
+  }
+  return line;
+}
+
+const typesDir = "dist/types";
 function tsconfigPaths({ verbose } = {}) {
   return {
     name: "vite-plugin-lib:alias",
@@ -155,8 +196,9 @@ function library(options) {
       cleanVueFileName: true,
       copyDtsFiles: true,
       include: `${path.resolve(options.entry, "..")}/**`,
-      outDir: "dist/types",
-      staticImport: true
+      outDir: typesDir,
+      staticImport: true,
+      afterBuild: includesESFormat(options.formats) ? () => generateMTSDeclarations(typesDir) : void 0
     })
   ];
 }
@@ -187,10 +229,17 @@ async function readConfig(configPath) {
     );
     return options;
   } catch (error) {
-    const message = "message" in error ? error.message : error;
+    const message = getErrorMessage(error);
     logError(`Could not read tsconfig.json: ${message}`);
     throw error;
   }
 }
+function includesESFormat(formats) {
+  return formats?.includes("es") ?? true;
+}
+function getErrorMessage(error) {
+  const isObject = typeof error === "object" && error !== null && "message" in error;
+  return isObject ? error.message : String(error);
+}
 
 export { library, tsconfigPaths };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-lib",
-  "version": "1.2.3",
+  "version": "1.4.0",
   "description": "Vite plugin for build configuration, automatic aliases, and type declarations.",
   "author": "Jan Müller <janmueller3698@gmail.com>",
   "license": "MIT",
@@ -18,9 +18,14 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.mjs"
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.cjs"
+      },
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      }
     }
   },
   "main": "dist/index.cjs",
@@ -36,13 +41,13 @@
   },
   "dependencies": {
     "picocolors": "1.0.0",
-    "vite-plugin-dts": "3.0.0"
+    "vite-plugin-dts": "3.3.1"
   },
   "devDependencies": {
-    "@types/node": "18.16.18",
-    "typescript": "5.1.3",
-    "unbuild": "1.2.1",
-    "vite": "4.3.9",
+    "@types/node": "18.17.1",
+    "typescript": "5.1.6",
+    "unbuild": "v2.0.0-rc.0",
+    "vite": "4.4.7",
     "@yeger/tsconfig": "1.1.2"
   },
   "publishConfig": {
@@ -51,7 +56,7 @@
   "scripts": {
     "build": "unbuild",
     "check:publish": "publint run --strict",
-    "check:tsc": "tsc --noEmit",
+    "check:tsc": "tsc",
     "lint": "yeger-lint"
   }
 }