pkgbld 1.33.0 → 1.34.0

package/dist/index.mjs

@@ -1,13 +1,13 @@
 import '@niceties/draftlog-appender';
 import { createLogger } from '@niceties/logger';
 import { rollup } from 'rollup';
-import fs, { access, readFile, writeFile, rm, readdir, mkdir, rename, stat } from 'fs/promises';
-import path from 'path';
+import fs, { access, readFile, writeFile, rm, readdir, mkdir, rename, stat } from 'node:fs/promises';
+import path from 'node:path';
 import { cli, command } from 'cleye';
 import refiner from '@slimlib/refine-partition';
 import camelCase from 'lodash/camelCase.js';
 import kleur from 'kleur';
-import { fileURLToPath } from 'url';
+import { fileURLToPath } from 'node:url';
 import cloneDeep from 'lodash/cloneDeep.js';
 import isEqual from 'lodash/isEqual.js';
 
@@ -282,38 +282,36 @@ function getCliOptions(plugins, pkg) {
             optimizeFiles: cliOptions.flags.optimizeFiles
         };
     }
-    else {
-        const flags = cliOptions.flags;
-        const options = {
-            kind: 'build',
-            umdInputs: flags.umd,
-            compressFormats: flags.compress,
-            sourcemapFormats: flags.sourcemaps,
-            formats: flags.formats,
-            formatsOverridden: flags.formats !== cliFlagsDefaults.formats,
-            preprocess: flags.preprocess,
-            dir: flags.dest,
-            sourceDir: flags.src,
-            bin: flags.bin,
-            includeExternals: flags.includeExternals,
-            eject: flags.eject,
-            noTsConfig: flags.noTsConfig,
-            noUpdatePackageJson: flags.noUpdatePackageJson,
-            commonjsPattern: flags.commonjsPattern,
-            esPattern: flags.esmPattern,
-            umdPattern: flags.umdPattern,
-            formatPackageJson: flags.formatPackageJson,
-            noPack: flags.noPack,
-            noExports: flags.noExports,
-            noClean: flags.noClean,
-            noBundle: flags.noBundle,
-            removeLegalComments: flags.removeLegalComments
-        };
-        for (const plugin of plugins) {
-            plugin.options?.(flags, options);
-        }
-        return options;
+    const flags = cliOptions.flags;
+    const options = {
+        kind: 'build',
+        umdInputs: flags.umd,
+        compressFormats: flags.compress,
+        sourcemapFormats: flags.sourcemaps,
+        formats: flags.formats,
+        formatsOverridden: flags.formats !== cliFlagsDefaults.formats,
+        preprocess: flags.preprocess,
+        dir: flags.dest,
+        sourceDir: flags.src,
+        bin: flags.bin,
+        includeExternals: flags.includeExternals,
+        eject: flags.eject,
+        noTsConfig: flags.noTsConfig,
+        noUpdatePackageJson: flags.noUpdatePackageJson,
+        commonjsPattern: flags.commonjsPattern,
+        esPattern: flags.esmPattern,
+        umdPattern: flags.umdPattern,
+        formatPackageJson: flags.formatPackageJson,
+        noPack: flags.noPack,
+        noExports: flags.noExports,
+        noClean: flags.noClean,
+        noBundle: flags.noBundle,
+        removeLegalComments: flags.removeLegalComments
+    };
+    for (const plugin of plugins) {
+        plugin.options?.(flags, options);
     }
+    return options;
 }
 
 async function getJson(fileName) {
@@ -394,17 +392,11 @@ function includeExternals(importer, external, id, config) {
     return true;
 }
 function isExternalInput(currentInput, inputs, inputsExt, id, config) {
-    let normalizedPath;
-    if (path.isAbsolute(currentInput)) {
-        normalizedPath = './' + path.relative(process.cwd(), `${currentInput}.${inputsExt.get(currentInput)}`);
-    }
-    else {
-        normalizedPath = './' + path.join(config.sourceDir, `${currentInput}.${inputsExt.get(currentInput)}`);
-    }
-    if (path.isAbsolute(id)) {
-        id = './' + path.relative(process.cwd(), id);
-    }
-    return normalizedPath !== id && inputs.includes(normalizedPath);
+    const normalizedPath = path.isAbsolute(currentInput)
+        ? `./${path.relative(process.cwd(), `${currentInput}.${inputsExt.get(currentInput)}`)}`
+        : `./${path.join(config.sourceDir, `${currentInput}.${inputsExt.get(currentInput)}`)}`;
+    const normalizedId = path.isAbsolute(id) ? `./${path.relative(process.cwd(), id)}` : id;
+    return normalizedPath !== normalizedId && inputs.includes(normalizedPath);
 }
 
 async function preprocess (provider, config, inputs, inputsExt) {
@@ -739,7 +731,7 @@ async function getRollupConfigs([provider, plugins$1], inputs, inputsExt, config
     }
 }
 
-const mainLoggerText = (sourceDir, dir, configsCount, startingTime, finishedCount = 0) => (final = false) => `${sourceDir} → ${dir} ${final ? configsCount : finishedCount++} / ${configsCount}${final ? (' in ' + getTimeDiff(startingTime)) : ''}`;
+const mainLoggerText = (sourceDir, dir, configsCount, startingTime, finishedCount = 0) => (final = false) => `${sourceDir} → ${dir} ${final ? configsCount : finishedCount++} / ${configsCount}${final ? (` in ${getTimeDiff(startingTime)}`) : ''}`;
 
 const emptySet = new Set;
 const sourceFileSuffixes = ['ts', 'tsx', 'js', 'jsx', 'cjs', 'mjs']; // svelte, vue, etc. are not supported yet
@@ -790,7 +782,7 @@ async function processPackage(pkg, config, plugins, tsConfig) {
         'default'
     ]);
     if (typeof pkg.typings === 'string') {
-        delete pkg.typings;
+        pkg.typings = undefined;
     }
     if (isDeclarations) {
         pkg.types = `./${config.dir}/${patternToName(typingsFilePattern, 'index')}`;
@@ -838,7 +830,7 @@ async function processPackage(pkg, config, plugins, tsConfig) {
         for (const id in pkg.exports) {
             if (id === './package.json')
                 continue;
-            const basename = id == '.' ? indexId : path.join(path.dirname(id), path.basename(id));
+            const basename = id === '.' ? indexId : path.join(path.dirname(id), path.basename(id));
             if (typeof pkg.exports[id] !== 'object') {
                 pkg.exports[id] = {};
             }
@@ -886,7 +878,7 @@ async function processPackage(pkg, config, plugins, tsConfig) {
             }
             config.bin = config.bin.filter(Boolean);
             if (config.bin.length === 0) {
-                delete config.bin;
+                config.bin = undefined;
             }
         }
     }
@@ -949,7 +941,7 @@ async function writeJson(path, json) {
     await fs.writeFile(path, toFormattedJson(json));
 }
 
-var version = "1.33.0";
+var version = "1.34.0";
 var name = "pkgbld";
 var license = "MIT";
 var author = "Konstantin Shutkin";
@@ -990,10 +982,10 @@ var dependencies = {
 	rollup: "^4.12.0",
 	"rollup-plugin-typescript2": "^0.36.0",
 	"rollup-plugin-preprocess": "^0.0.4",
-	"@rollup/plugin-commonjs": "^26.0.1",
+	"@rollup/plugin-commonjs": "^28.0.2",
 	"@rollup/plugin-terser": "^0.4.4",
 	"@rollup/plugin-json": "^6.1.0",
-	"@rollup/plugin-node-resolve": "^15.2.3",
+	"@rollup/plugin-node-resolve": "^16.0.0",
 	"@rollup-extras/plugin-clean": "^1.3.9",
 	"@rollup-extras/plugin-binify": "^1.1.10",
 	"@rollup-extras/plugin-externals": "^1.2.2",
@@ -1123,9 +1115,9 @@ async function updatePackageJson(pkg) {
     }
     const devDependencies = pkg.devDependencies;
     if ('pkgbld' in devDependencies) {
-        delete devDependencies.pkgbld;
+        devDependencies.pkgbld = undefined;
     }
-    devDependencies['rollup'] = pkgbldPkg.dependencies['rollup'] ;
+    devDependencies.rollup = pkgbldPkg.dependencies.rollup;
     const isBuiltin = (await import('is-builtin-module')).default;
     for (const key of imports.keys()) {
         const packageName = getPackageName(key);
@@ -1166,7 +1158,7 @@ async function checkTsConfig(options, mainLogger, plugins) {
     try {
         [, config] = await getJson('jsconfig.json');
         if (config && typeof config === 'object' && !Array.isArray(config)) {
-            config['allowJs'] = true;
+            config.allowJs = true;
         }
     }
     catch (_) { /*ignore*/ }
@@ -1207,8 +1199,8 @@ async function prunePkg(pkg, options, logger) {
     if (!keys) {
         throw new Error(`unknown profile ${options.profile}`);
     }
-    delete pkg.devDependencies;
-    delete pkg['packageManager'];
+    pkg.devDependencies = undefined;
+    pkg.packageManager = undefined;
     if (pkg.scripts) {
         for (const key of Object.keys(pkg.scripts)) {
             if (!keys.has(key)) {
@@ -1216,14 +1208,14 @@ async function prunePkg(pkg, options, logger) {
             }
         }
         if (Object.keys(pkg.scripts).length === 0) {
-            delete pkg.scripts;
+            pkg.scripts = undefined;
         }
     }
     if (options.flatten) {
         await flatten(pkg, options.flatten, logger);
     }
     if (options.removeSourcemaps) {
-        const sourceMaps = await walkDir('.').then(files => files.filter(file => file.endsWith('.map')));
+        const sourceMaps = await walkDir('.', ['node_modules']).then(files => files.filter(file => file.endsWith('.map')));
         for (const sourceMap of sourceMaps) {
             // find corresponding file
             const sourceFile = sourceMap.slice(0, -4);
@@ -1317,7 +1309,7 @@ async function prunePkg(pkg, options, logger) {
         }
         pkg.files = pkg.files.filter(dir => !ignoreDirs.includes(dir));
         if (pkg.files.length === 0) {
-            delete pkg.files;
+            pkg.files = undefined;
         }
     }
 }
@@ -1361,7 +1353,7 @@ async function flatten(pkg, flatten, logger) {
     }
     logger.update(`flattening ${distDir}...`);
     // check if dist can be flattened
-    const relativeDistDir = './' + distDir;
+    const relativeDistDir = `./${distDir}`;
     const existsPromises = [];
     const filesInDist = await walkDir(relativeDistDir);
     for (const file of filesInDist) {
@@ -1379,12 +1371,11 @@ async function flatten(pkg, flatten, logger) {
         && typeof pkg.directories.bin === 'string' && normalizePath(pkg.directories.bin) === normalizePath(flatten)) {
         delete pkg.directories.bin;
         if (Object.keys(pkg.directories).length === 0) {
-            delete pkg.directories;
+            pkg.directories = undefined;
         }
         const files = await readdir(flatten);
         if (files.length === 1) {
-            const file = files[0];
-            pkg.bin = file;
+            pkg.bin = files[0];
         }
         else {
             pkg.bin = {};
@@ -1412,7 +1403,7 @@ async function flatten(pkg, flatten, logger) {
     }
     await Promise.all(renamePromises);
     let cleanedDir = relativeDistDir;
-    while (isEmptyDir(cleanedDir)) {
+    while (await isEmptyDir(cleanedDir)) {
         await rm(cleanedDir, { recursive: true, force: true });
         const parentDir = path.dirname(cleanedDir);
         if (parentDir === '.') {
@@ -1423,7 +1414,7 @@ async function flatten(pkg, flatten, logger) {
     const normalizedCleanDir = normalizePath(cleanedDir);
     const allReferencesSet = new Set(allReferences);
     // update package.json
-    const stringToReplace = distDir + '/'; // we append / to remove in from the middle of the string
+    const stringToReplace = `${distDir}/`; // we append / to remove in from the middle of the string
     const pkgClone = cloneAndUpdate(pkg, value => allReferencesSet.has(value) ? value.replace(stringToReplace, '') : value);
     Object.assign(pkg, pkgClone);
     // update files
@@ -1482,27 +1473,25 @@ function isSubDirectory(parent, child) {
     return path.relative(child, parent).startsWith('..');
 }
 async function isEmptyDir(dir) {
-    const entries = await readdir(dir);
-    return entries.length === 0;
+    const entries = await readdir(dir, { withFileTypes: true });
+    return entries.filter(entry => !entry.isDirectory()).length === 0;
 }
 async function isDirectory(file) {
     const fileStat = await stat(file);
     return fileStat.isDirectory();
 }
-async function walkDir(dir) {
+async function walkDir(dir, ignoreDirs = []) {
     const entries = await readdir(dir, { withFileTypes: true });
     const files = [];
     await Promise.all(entries.map(entry => {
         const childPath = path.join(dir, entry.name);
-        if (entry.isDirectory()) {
+        if (entry.isDirectory() && !ignoreDirs.includes(entry.name)) {
             return walkDir(childPath)
                 .then(childFiles => {
                 files.push(...childFiles);
             });
         }
-        else {
-            files.push(childPath);
-        }
+        files.push(childPath);
     }).filter(Boolean));
     return files;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.33.0",
+  "version": "1.34.0",
   "name": "pkgbld",
   "license": "MIT",
   "author": "Konstantin Shutkin",
@@ -34,10 +34,10 @@
     "rollup": "^4.12.0",
     "rollup-plugin-typescript2": "^0.36.0",
     "rollup-plugin-preprocess": "^0.0.4",
-    "@rollup/plugin-commonjs": "^26.0.1",
+    "@rollup/plugin-commonjs": "^28.0.2",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup-extras/plugin-clean": "^1.3.9",
     "@rollup-extras/plugin-binify": "^1.1.10",
     "@rollup-extras/plugin-externals": "^1.2.2",