pkgbld 1.33.1 → 1.34.1

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';
 
@@ -227,7 +227,7 @@ function processPackageJson(pkg, needTreatment, treatKey) {
     return newPkg;
 }
 function toFormattedJson(json) {
-    return JSON.stringify(json, null, 2) + '\n';
+    return `${JSON.stringify(json, null, 2)}\n`;
 }
 
 function FlattenParam(value) {
@@ -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) {
@@ -576,7 +568,9 @@ async function getRollupConfigs([provider, plugins$1], inputs, inputsExt, config
         factoryInProgress.push(factory(provider, config, inputs, inputsExt));
     }
     for (const ePlugin of externalPlugins) {
-        ePlugin.providePlugins && factoryInProgress.push(ePlugin.providePlugins(provider, config, inputs, inputsExt));
+        if (ePlugin.providePlugins) {
+            factoryInProgress.push(ePlugin.providePlugins(provider, config, inputs, inputsExt));
+        }
     }
     await Promise.all(factoryInProgress);
     const expandInputs = new Set;
@@ -627,7 +621,7 @@ async function getRollupConfigs([provider, plugins$1], inputs, inputsExt, config
         for (const { format, input } of result) {
             if (input) {
                 if (mapFormatInputs.has(format)) {
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    // biome-ignore lint/style/noNonNullAssertion: <explanation>
                     mapFormatInputs.get(format).add(input);
                 }
                 else {
@@ -693,7 +687,9 @@ async function getRollupConfigs([provider, plugins$1], inputs, inputsExt, config
                 break;
         }
         for (const ePlugin of externalPlugins) {
-            ePlugin.getExtraOutputSettings && Object.assign(result, ePlugin.getExtraOutputSettings(format, inputs));
+            if (ePlugin.getExtraOutputSettings) {
+                Object.assign(result, ePlugin.getExtraOutputSettings(format, inputs));
+            }
         }
         return result;
     }
@@ -739,7 +735,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 +786,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 +834,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 +882,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,95 +945,30 @@ async function writeJson(path, json) {
     await fs.writeFile(path, toFormattedJson(json));
 }
 
-var version = "1.33.1";
-var name = "pkgbld";
-var license = "MIT";
-var author = "Konstantin Shutkin";
-var bin = "./index.js";
-var type = "module";
-var main = "./dist/index.mjs";
-var types = "./dist/index.d.ts";
-var files = [
-	"dist"
-];
-var engines = {
-	node: ">=20"
-};
-var repository = {
-	type: "git",
-	url: "git+https://github.com/kshutkin/package-build.git",
-	directory: "pkgbld"
-};
-var bugs = "https://github.com/kshutkin/package-build/issues";
-var homepage = "https://github.com/kshutkin/package-build/blob/main/pkgbld/README.md";
-var readme = "README.md";
-var keywords = [
-	"pkgbld",
-	"build",
-	"exports",
-	"rollup"
-];
-var scripts = {
-	build: "rollup -c && dts-bundle-generator -o dist/index.d.ts src/index.ts",
-	lint: "eslint ./src",
-	prepack: "node ./index.js prune --removeSourcemaps",
-	test: "c8 --src=. --all -r=html node --env-file=ci.env tests/test.js"
-};
 var dependencies = {
-	"@niceties/logger": "^1.1.12",
-	"@niceties/draftlog-appender": "^1.3.2",
+	"@niceties/logger": "^1.1.13",
+	"@niceties/draftlog-appender": "^1.3.3",
 	lodash: "^4.17.21",
-	rollup: "^4.12.0",
+	rollup: "^4.34.7",
 	"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",
 	"@slimlib/refine-partition": "^1.0.3",
 	"@slimlib/smart-mock": "^0.1.6",
 	"is-builtin-module": "^3.2.1",
-	terser: "^5.28.1",
+	terser: "^5.39.0",
 	kleur: "^4.1.5",
-	cleye: "^1.3.2",
-	jsonata: "^2.0.4"
-};
-var devDependencies = {
-	"@types/lodash": "^4.14.202",
-	"@total-typescript/ts-reset": "^0.5.1",
-	"type-fest": "^4.20.1",
-	"dts-bundle-generator": "^9.5.1",
-	options: "workspace:*",
-	c8: "^10.0.0",
-	"cli-test-helper": "workspace:*"
-};
-var peerDependencies = {
-	typescript: ">=5.3.3"
+	cleye: "^1.3.4",
+	jsonata: "^2.0.6"
 };
 var pkgbldPkg = {
-	version: version,
-	name: name,
-	license: license,
-	author: author,
-	bin: bin,
-	type: type,
-	main: main,
-	types: types,
-	files: files,
-	engines: engines,
-	repository: repository,
-	bugs: bugs,
-	homepage: homepage,
-	readme: readme,
-	keywords: keywords,
-	scripts: scripts,
-	dependencies: dependencies,
-	devDependencies: devDependencies,
-	peerDependencies: peerDependencies
-};
+	dependencies: dependencies};
 
 const imports = new Map;
 const setup = new Set;
@@ -1063,7 +994,7 @@ async function createEjectProvider(preimportMap) {
             globalImport: (module, exportName) => {
                 imports.set(module, exportName ?? 'default');
             },
-            // eslint-disable-next-line @typescript-eslint/ban-types
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
             globalSetup: (code) => {
                 if (typeof code === 'function') {
                     setup.add(code.toString());
@@ -1123,9 +1054,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);
@@ -1158,16 +1089,19 @@ async function checkTsConfig(options, mainLogger, plugins) {
     if (options.noTsConfig) {
         return;
     }
+    // biome-ignore lint/style/useSingleVarDeclarator: <explanation>
     let config, needWrite = false;
     try {
         [, config] = await getJson('tsconfig.json');
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
     }
     catch (_) { /*ignore*/ }
     try {
         [, config] = await getJson('jsconfig.json');
         if (config && typeof config === 'object' && !Array.isArray(config)) {
-            config['allowJs'] = true;
+            config.allowJs = true;
         }
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
     }
     catch (_) { /*ignore*/ }
     if (!config) {
@@ -1207,8 +1141,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,7 +1150,7 @@ async function prunePkg(pkg, options, logger) {
             }
         }
         if (Object.keys(pkg.scripts).length === 0) {
-            delete pkg.scripts;
+            pkg.scripts = undefined;
         }
     }
     if (options.flatten) {
@@ -1317,7 +1251,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 +1295,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 +1313,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 +1345,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 +1356,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,8 +1415,8 @@ 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);
@@ -1500,9 +1433,7 @@ async function walkDir(dir, ignoreDirs = []) {
                 files.push(...childFiles);
             });
         }
-        else {
-            files.push(childPath);
-        }
+        files.push(childPath);
     }).filter(Boolean));
     return files;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.33.1",
+  "version": "1.34.1",
   "name": "pkgbld",
   "license": "MIT",
   "author": "Konstantin Shutkin",
@@ -28,26 +28,26 @@
     "rollup"
   ],
   "dependencies": {
-    "@niceties/logger": "^1.1.12",
-    "@niceties/draftlog-appender": "^1.3.2",
+    "@niceties/logger": "^1.1.13",
+    "@niceties/draftlog-appender": "^1.3.3",
     "lodash": "^4.17.21",
-    "rollup": "^4.12.0",
+    "rollup": "^4.34.7",
     "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",
     "@slimlib/refine-partition": "^1.0.3",
     "@slimlib/smart-mock": "^0.1.6",
     "is-builtin-module": "^3.2.1",
-    "terser": "^5.28.1",
+    "terser": "^5.39.0",
     "kleur": "^4.1.5",
-    "cleye": "^1.3.2",
-    "jsonata": "^2.0.4"
+    "cleye": "^1.3.4",
+    "jsonata": "^2.0.6"
   },
   "peerDependencies": {
     "typescript": ">=5.3.3"