pkgbld 1.34.0 → 1.35.0

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import '@niceties/draftlog-appender';
 import { createLogger } from '@niceties/logger';
 import { rollup } from 'rollup';
-import fs, { access, readFile, writeFile, rm, readdir, mkdir, rename, stat } from 'node:fs/promises';
-import path from 'node:path';
+import fs, { readFile, access, stat, constants, writeFile, rm, readdir, mkdir, rename } from 'node:fs/promises';
+import path, { dirname, join } from 'node:path';
 import { cli, command } from 'cleye';
 import refiner from '@slimlib/refine-partition';
 import camelCase from 'lodash/camelCase.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) {
@@ -556,6 +556,68 @@ async function isExists(file) {
     }
     return file;
 }
+// it is borrowed from vite logic, basically the same but simplified
+// without recursion and fully async
+async function isReadable(file) {
+    try {
+        await stat(file);
+    }
+    catch {
+        return false;
+    }
+    try {
+        await access(file, constants.R_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function hasFile(root, file) {
+    const path = join(root, file);
+    return isExists(path);
+}
+async function hasWorkspacePackageJson(root) {
+    const path = join(root, 'package.json');
+    if (!await isReadable(path)) {
+        return false;
+    }
+    try {
+        const content = (JSON.parse(await readFile(path, 'utf-8')) || {});
+        return !!content.workspaces;
+    }
+    catch {
+        return false;
+    }
+}
+async function searchForPackageRoot(current) {
+    const root = current;
+    let dir = current;
+    while (dir) {
+        if (await hasFile(dir, 'package.json'))
+            return dir;
+        const parentDir = dirname(dir);
+        if (parentDir === dir)
+            break; // Reached the filesystem root
+        dir = parentDir;
+    }
+    return root;
+}
+async function searchForWorkspaceRoot(current) {
+    const root = await searchForPackageRoot(current);
+    let dir = current;
+    while (dir) {
+        if (await hasFile(dir, 'pnpm-workspace.yaml'))
+            return dir;
+        if (await hasWorkspacePackageJson(dir))
+            return dir;
+        const parentDir = dirname(dir);
+        if (parentDir === dir)
+            break; // Reached the filesystem root
+        dir = parentDir;
+    }
+    return root;
+}
 
 async function getRollupConfigs([provider, plugins$1], inputs, inputsExt, config, helpers, externalPlugins) {
     const factoryInProgress = [];
@@ -568,7 +630,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;
@@ -619,7 +683,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 {
@@ -685,7 +749,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;
     }
@@ -941,45 +1007,11 @@ async function writeJson(path, json) {
     await fs.writeFile(path, toFormattedJson(json));
 }
 
-var version = "1.34.0";
-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": "^28.0.2",
@@ -992,44 +1024,13 @@ var dependencies = {
 	"@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;
@@ -1055,7 +1056,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());
@@ -1150,9 +1151,11 @@ 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 {
@@ -1160,6 +1163,7 @@ async function checkTsConfig(options, mainLogger, plugins) {
         if (config && typeof config === 'object' && !Array.isArray(config)) {
             config.allowJs = true;
         }
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
     }
     catch (_) { /*ignore*/ }
     if (!config) {
@@ -1181,11 +1185,14 @@ async function checkTsConfig(options, mainLogger, plugins) {
     return config;
 }
 
-async function loadPlugins(pkg) {
+async function loadPlugins(pkg, loaded) {
     try {
         return await Promise.all([...new Set([...Object.keys(pkg.devDependencies || {}), ...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {})])]
-            .filter(packageName => packageName.startsWith('pkgbld-plugin-'))
-            .map(packageName => import(packageName).then((pluginFactory) => pluginFactory.create())));
+            .filter(packageName => packageName.startsWith('pkgbld-plugin-') && !loaded.has(packageName))
+            .map(packageName => {
+            loaded.add(packageName);
+            return import(packageName).then((pluginFactory) => pluginFactory.create());
+        }));
     }
     catch (e) {
         console.error(e);
@@ -1369,6 +1376,7 @@ async function flatten(pkg, flatten, logger) {
     if (typeof flatten === 'string' && 'directories' in pkg && pkg.directories != null
         && typeof pkg.directories === 'object' && 'bin' in pkg.directories
         && typeof pkg.directories.bin === 'string' && normalizePath(pkg.directories.bin) === normalizePath(flatten)) {
+        // biome-ignore lint/performance/noDelete: <explanation>
         delete pkg.directories.bin;
         if (Object.keys(pkg.directories).length === 0) {
             pkg.directories = undefined;
@@ -1538,7 +1546,12 @@ async function execute() {
         let pkgPath;
         // eslint-disable-next-line prefer-const
         [pkgPath, pkg] = await getJson('package.json');
-        const plugins = await loadPlugins(pkg);
+        const loadedPlugins = new Set;
+        const plugins = await loadPlugins(pkg, loadedPlugins);
+        const [rootPackagePath, rootPkg] = await getJson(join(await searchForWorkspaceRoot(dirname(pkgPath)), 'package.json'));
+        if (rootPackagePath !== pkgPath) {
+            plugins.push(...await loadPlugins(rootPkg, loadedPlugins));
+        }
         mainLogger.update('');
         process.stdout.moveCursor?.(0, -1);
         const options = getCliOptions(plugins, pkg);

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.34.0",
+  "version": "1.35.0",
   "name": "pkgbld",
   "license": "MIT",
   "author": "Konstantin Shutkin",
@@ -28,10 +28,10 @@
     "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": "^28.0.2",
@@ -44,10 +44,10 @@
     "@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"