@foxford/tsup-config 1.0.0 → 1.0.1

package/index.cjs

@@ -64,6 +64,7 @@ var __async = (__this, __arguments, generator) => {
 // src/index.js
 var src_exports = {};
 __export(src_exports, {
+  addExtensionsToRelativeImports: () => addExtensionsToRelativeImports,
   assertSourceExports: () => assertSourceExports,
   copyReadme: () => copyReadme,
   createTsupConfig: () => createTsupConfig,
@@ -141,8 +142,8 @@ function writeBuildPackageJson({ entries, extensions, main, module: moduleField,
     "files"
   ]);
   const packageJson = Object.fromEntries(Object.entries(source).filter(([field]) => !DEV_ONLY.has(field)));
-  packageJson.main = main;
-  packageJson.module = moduleField;
+  if (main !== void 0) packageJson.main = main;
+  if (moduleField !== void 0) packageJson.module = moduleField;
   packageJson.exports = toBuildExports(entries, { extensions });
   import_node_fs.default.writeFileSync(import_node_path.default.join(outDir, "package.json"), `${JSON.stringify(packageJson, null, 2)}
 `);
@@ -169,9 +170,35 @@ function updateBuildFiles(outDir = "build") {
 function copyReadme(outDir = "build") {
   import_node_fs.default.copyFileSync("README.mdx", import_node_path.default.join(outDir, "README.mdx"));
 }
+function addExtensionsToRelativeImports(outDir = "build") {
+  const RELATIVE = /(\bfrom\s*|\bimport\s*\(\s*|\bimport\s+)(['"])(\.[^'"]*)\2/g;
+  let patched = 0;
+  const walk = (dir) => {
+    for (const entry of import_node_fs.default.readdirSync(dir, { withFileTypes: true })) {
+      const full = import_node_path.default.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        walk(full);
+        continue;
+      }
+      if (!entry.name.endsWith(".js")) continue;
+      const source = import_node_fs.default.readFileSync(full, "utf-8");
+      const result = source.replace(RELATIVE, (match, prefix, quote, specifier) => {
+        if (/\.[cm]?jsx?$/.test(specifier)) return match;
+        const target = import_node_path.default.resolve(import_node_path.default.dirname(full), specifier);
+        const suffix = import_node_fs.default.existsSync(`${target}.js`) ? ".js" : import_node_fs.default.existsSync(import_node_path.default.join(target, "index.js")) ? "/index.js" : null;
+        if (suffix === null) return match;
+        patched += 1;
+        return `${prefix}${quote}${specifier}${suffix}${quote}`;
+      });
+      if (result !== source) import_node_fs.default.writeFileSync(full, result);
+    }
+  };
+  walk(outDir);
+  return patched;
+}
 function createTsupConfig({ entries, overrides = {} }) {
   const extensions = (name) => ({
-    import: `./${name}.mjs`,
+    import: `./${name}.js`,
     require: `./${name}.cjs`,
     types: `./${name}.d.ts`
   });
@@ -193,23 +220,20 @@ function createTsupConfig({ entries, overrides = {} }) {
     format: ["cjs", "esm"],
     onSuccess: () => __async(null, null, function* () {
       copyReadme();
-      writeBuildPackageJson({
+      const root = entries["."];
+      writeBuildPackageJson(__spreadValues({
         entries,
-        extensions,
-        main: "./index.cjs",
-        module: "./index.mjs"
-      });
+        extensions
+      }, root === void 0 ? {} : { main: extensions(artifactName(".", root)).require, module: extensions(artifactName(".", root)).import }));
     }),
     outDir: "build",
-    // Явные расширения: при "type": "module" tsup по умолчанию отдаёт ESM как .js,
-    // и ссылки на ./*.mjs в build/package.json оказываются битыми
-    outExtension: ({ format }) => ({ js: format === "cjs" ? ".cjs" : ".mjs" }),
     sourcemap: false,
     splitting: false
   }, overrides);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  addExtensionsToRelativeImports,
   assertSourceExports,
   copyReadme,
   createTsupConfig,

package/index.d.ts

@@ -36,5 +36,11 @@ export function verifyBuildExports(outDir?: string): void
 /** Копирует README.mdx рядом с артефактом. */
 export function copyReadme(outDir?: string): void
 
+/**
+ * Дописывает расширения в относительных импортах собранного ESM (Node их требует,
+ * а tsc переносит спецификаторы из исходника как есть). Возвращает число правок.
+ */
+export function addExtensionsToRelativeImports(outDir?: string): number
+
 /** Готовый tsup-конфиг публикуемого пакета монорепо. */
 export function createTsupConfig(options: { entries: Entries; overrides?: Options }): Options

package/index.mjs

@@ -102,8 +102,8 @@ function writeBuildPackageJson({ entries, extensions, main, module: moduleField,
     "files"
   ]);
   const packageJson = Object.fromEntries(Object.entries(source).filter(([field]) => !DEV_ONLY.has(field)));
-  packageJson.main = main;
-  packageJson.module = moduleField;
+  if (main !== void 0) packageJson.main = main;
+  if (moduleField !== void 0) packageJson.module = moduleField;
   packageJson.exports = toBuildExports(entries, { extensions });
   fs.writeFileSync(path.join(outDir, "package.json"), `${JSON.stringify(packageJson, null, 2)}
 `);
@@ -130,9 +130,35 @@ function updateBuildFiles(outDir = "build") {
 function copyReadme(outDir = "build") {
   fs.copyFileSync("README.mdx", path.join(outDir, "README.mdx"));
 }
+function addExtensionsToRelativeImports(outDir = "build") {
+  const RELATIVE = /(\bfrom\s*|\bimport\s*\(\s*|\bimport\s+)(['"])(\.[^'"]*)\2/g;
+  let patched = 0;
+  const walk = (dir) => {
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+      const full = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        walk(full);
+        continue;
+      }
+      if (!entry.name.endsWith(".js")) continue;
+      const source = fs.readFileSync(full, "utf-8");
+      const result = source.replace(RELATIVE, (match, prefix, quote, specifier) => {
+        if (/\.[cm]?jsx?$/.test(specifier)) return match;
+        const target = path.resolve(path.dirname(full), specifier);
+        const suffix = fs.existsSync(`${target}.js`) ? ".js" : fs.existsSync(path.join(target, "index.js")) ? "/index.js" : null;
+        if (suffix === null) return match;
+        patched += 1;
+        return `${prefix}${quote}${specifier}${suffix}${quote}`;
+      });
+      if (result !== source) fs.writeFileSync(full, result);
+    }
+  };
+  walk(outDir);
+  return patched;
+}
 function createTsupConfig({ entries, overrides = {} }) {
   const extensions = (name) => ({
-    import: `./${name}.mjs`,
+    import: `./${name}.js`,
     require: `./${name}.cjs`,
     types: `./${name}.d.ts`
   });
@@ -154,22 +180,19 @@ function createTsupConfig({ entries, overrides = {} }) {
     format: ["cjs", "esm"],
     onSuccess: () => __async(null, null, function* () {
       copyReadme();
-      writeBuildPackageJson({
+      const root = entries["."];
+      writeBuildPackageJson(__spreadValues({
         entries,
-        extensions,
-        main: "./index.cjs",
-        module: "./index.mjs"
-      });
+        extensions
+      }, root === void 0 ? {} : { main: extensions(artifactName(".", root)).require, module: extensions(artifactName(".", root)).import }));
     }),
     outDir: "build",
-    // Явные расширения: при "type": "module" tsup по умолчанию отдаёт ESM как .js,
-    // и ссылки на ./*.mjs в build/package.json оказываются битыми
-    outExtension: ({ format }) => ({ js: format === "cjs" ? ".cjs" : ".mjs" }),
     sourcemap: false,
     splitting: false
   }, overrides);
 }
 export {
+  addExtensionsToRelativeImports,
   assertSourceExports,
   copyReadme,
   createTsupConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foxford/tsup-config",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Общая сборка публикуемых пакетов: декларация точек входа, tsup-конфиг, генерация публикуемого package.json",
   "keywords": [
     "foxford",
@@ -37,6 +37,6 @@
     "index.mjs",
     "package.json"
   ],
-  "sha": "fd3591a",
+  "sha": "d0aa793",
   "scripts": {}
 }