pkgbld 1.30.0 → 1.31.0

package/dist/index.d.ts

@@ -1,99 +1,77 @@
-/// <reference types="@niceties/draftlog-appender" />
+// Generated by dts-bundle-generator v9.5.1
 
-declare module 'pkgbld' {
-	import type { Plugin, InternalModuleFormat, OutputOptions } from 'rollup';
-	import type { Logger } from '@niceties/logger';
-	export type Json = null | string | number | boolean | Json[] | {
-		[name: string]: Json;
-	};
-	export type ProvideFunction = (factory: () => Plugin, priority: number, options?: {
-		format?: InternalModuleFormat | InternalModuleFormat[];
-		inputs?: string[];
-		outputPlugin?: true;
-	}) => void;
-	export type Provider = {
-		provide: ProvideFunction;
-		import: (module: string, exportName?: string) => Promise<((...args: unknown[]) => Plugin)>;
-		globalImport: (module: string, exportName?: string | string[]) => void;
-		globalSetup: (code: Function | string) => void;
-	};
-	export type PkgbldRollupPlugin = {
-		plugin: () => Plugin;
-		priority: number;
-		format?: InternalModuleFormat | InternalModuleFormat[];
-		inputs?: string[];
-		outputPlugin?: true;
-	};
-	export type CliOptions = NonNullable<Extract<ReturnType<typeof getCliOptions>, {
-		kind: 'build';
-	}>>;
-	export type ParsedOptions = Record<string, string | number | string[] | number[] | boolean | undefined>;
-	export interface PkgbldPlugin {
-		options(parsedArgs: ParsedOptions, options: CliOptions): void;
-		processPackageJson(packageJson: PackageJson, inputs: string[], logger: Logger): void;
-		processTsConfig(config: Json): void;
-		providePlugins(provider: Provider, config: ParsedOptions, inputs: string[], inputsExt: Map<string, string>): Promise<void>;
-		getExtraOutputSettings(format: InternalModuleFormat, inputs: string[]): Partial<OutputOptions>;
-		buildEnd(): Promise<void>;
-	}
-	export type PackageJson = {
-		private?: boolean;
-		version?: string;
-		name?: string;
-		bin?: string | Record<string, string>;
-		main?: string;
-		license?: string;
-		readme?: string;
-		author?: string | {
-			name?: string;
-			email?: string;
-			url?: string;
-		};
-		description?: string;
-		scripts?: {
-			[key: string]: string;
-		};
-		repository?: {
-			type?: string;
-			url?: string;
-		};
-		files?: string[];
-		bugs?: string;
-		homepage?: string;
-		dependencies?: Record<string, string>;
-		devDependencies?: Record<string, string>;
-		peerDependencies?: Record<string, string>;
-		exports?: Record<string, string | Record<string, string>>;
-	};
-	function getCliOptions(plugins: Partial<PkgbldPlugin>[], pkg: PackageJson): {
-		kind: 'build';
-		umdInputs: string[];
-		compressFormats: string[];
-		sourcemapFormats: string[];
-		formats: string[];
-		formatsOverridden: boolean;
-		preprocess: string[];
-		dir: string;
-		sourceDir: string;
-		bin?: string[] | undefined;
-		includeExternals: boolean | string[];
-		eject: boolean;
-		noTsConfig: boolean;
-		noUpdatePackageJson: boolean;
-		commonjsPattern: string;
-		esPattern: string;
-		umdPattern: string;
-		formatPackageJson: boolean;
-		noPack: boolean;
-		noExports: boolean;
-		noClean: boolean;
-		noBundle: boolean;
-	} | {
-		readonly kind: "prune";
-		readonly profile: string;
-		readonly flatten: string | boolean;
-		readonly removeSourcemaps: boolean;
-		readonly optimizeFiles: boolean;
-	};
+import { InternalModuleFormat, OutputOptions, Plugin } from 'rollup';
+import { JsonObject, PackageJson } from 'type-fest';
+
+declare function getCliOptions(plugins: Partial<PkgbldPlugin>[], pkg: PackageJson): {
+	kind: "build";
+	umdInputs: string[];
+	compressFormats: string[];
+	sourcemapFormats: string[];
+	formats: string[];
+	formatsOverridden: boolean;
+	preprocess: string[];
+	dir: string;
+	sourceDir: string;
+	bin?: string[] | undefined;
+	includeExternals: boolean | string[];
+	eject: boolean;
+	noTsConfig: boolean;
+	noUpdatePackageJson: boolean;
+	commonjsPattern: string;
+	esPattern: string;
+	umdPattern: string;
+	formatPackageJson: boolean;
+	noPack: boolean;
+	noExports: boolean;
+	noClean: boolean;
+	noBundle: boolean;
+} | {
+	readonly kind: "prune";
+	readonly profile: string;
+	readonly flatten: string | boolean;
+	readonly removeSourcemaps: boolean;
+	readonly optimizeFiles: boolean;
+};
+export type Json = null | string | number | boolean | Json[] | {
+	[name: string]: Json;
+};
+export type ProvideFunction = (factory: () => Plugin, priority: number, options?: {
+	format?: InternalModuleFormat | InternalModuleFormat[];
+	inputs?: string[];
+	outputPlugin?: true;
+}) => void;
+export type Provider = {
+	provide: ProvideFunction;
+	import: (module: string, exportName?: string) => Promise<((...args: unknown[]) => Plugin)>;
+	globalImport: (module: string, exportName?: string | string[]) => void;
+	globalSetup: (code: Function | string) => void;
+};
+export type PkgbldRollupPlugin = {
+	plugin: () => Plugin;
+	priority: number;
+	format?: InternalModuleFormat | InternalModuleFormat[];
+	inputs?: string[];
+	outputPlugin?: true;
+};
+export type CliOptions = NonNullable<Extract<ReturnType<typeof getCliOptions>, {
+	kind: "build";
+}>>;
+export type ParsedOptions = Record<string, string | number | string[] | number[] | boolean | undefined>;
+export interface PkgbldPluginFactory {
+	create(): Promise<Partial<PkgbldPlugin>>;
+}
+export interface PkgbldPlugin {
+	options(parsedArgs: ParsedOptions, options: CliOptions): void;
+	processPackageJson(packageJson: PackageJson, inputs: string[]): void;
+	processTsConfig(config: JsonObject): void;
+	providePlugins(provider: Provider, config: ParsedOptions, inputs: string[], inputsExt: Map<string, string>): Promise<void>;
+	getExtraOutputSettings(format: InternalModuleFormat, inputs: string[]): Partial<OutputOptions>;
+	buildEnd(): Promise<void>;
 }
 
+export {
+	PackageJson,
+};
+
+export {};

package/dist/index.mjs

@@ -734,7 +734,7 @@ async function processPackage(pkg, config, plugins, tsConfig) {
     const typingsFilePattern = '[name].d.ts';
     const indexId = 'index';
     const typesVersionsLastFields = new Set(['*']);
-    // check if declarations ebabled
+    // check if declarations enabled
     const isDeclarations = typeof tsConfig === 'object'
         && tsConfig != null && 'compilerOptions' in tsConfig
         && typeof tsConfig.compilerOptions === 'object' && tsConfig.compilerOptions !== null
@@ -864,7 +864,7 @@ async function processPackage(pkg, config, plugins, tsConfig) {
         config.formats.push('umd');
     }
     for (const plugin of plugins) {
-        plugin.processPackageJson?.(pkg, inputs, logger);
+        plugin.processPackageJson?.(pkg, inputs);
     }
     if (config.bin) {
         if (config.bin.length > 0) {
@@ -936,7 +936,7 @@ async function writeJson(path, json) {
     await fs.writeFile(path, toFormattedJson(json));
 }
 
-var version = "1.30.0";
+var version = "1.31.0";
 var name = "pkgbld";
 var license = "MIT";
 var author = "Konstantin Shutkin";
@@ -965,7 +965,7 @@ var keywords = [
 	"rollup"
 ];
 var scripts = {
-	build: "xc6 rm src/options-types.ts && xc6 ln ../options/src/types.ts src/options-types.ts && rollup -c && dts-buddy dist/index.d.ts -m pkgbld:dist/src/index.d.ts && xc6 rm dist/src",
+	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"
@@ -995,9 +995,9 @@ var dependencies = {
 var devDependencies = {
 	"@types/lodash": "^4.14.202",
 	"@total-typescript/ts-reset": "^0.5.1",
-	"dts-buddy": "^0.4.5",
+	"type-fest": "^4.20.1",
+	"dts-bundle-generator": "^9.5.1",
 	options: "workspace:*",
-	xc6: "workspace:*",
 	c8: "^9.1.0",
 	"cli-test-helper": "workspace:*"
 };
@@ -1180,7 +1180,7 @@ async function loadPlugins(pkg) {
     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)));
+            .map(packageName => import(packageName).then((pluginFactory) => pluginFactory.create())));
     }
     catch (e) {
         console.error(e);
@@ -1314,6 +1314,10 @@ async function flatten(pkg, flatten, logger) {
     const expression = jsonata('[bin, bin.*, main, module, unpkg, umd, types, typings, exports[].*.*, typesVersions.*.*, directories.bin]');
     const allReferences = (await expression.evaluate(pkg));
     let distDir;
+    // at this point we requested directories.bin, but it is the only one that is directory and not a file
+    // later when we get dirname we can't flatten directories.bin completely
+    // it is easy to fix by checking element is a directory but it is kind of good
+    // to have it as a separate directory, but user still can flatten it by specifying the directory
     if (flatten === true) {
         let commonSegments;
         for (const entry of allReferences) {
@@ -1337,7 +1341,7 @@ async function flatten(pkg, flatten, logger) {
         distDir = commonSegments?.join('/');
     }
     else {
-        distDir = flatten;
+        distDir = normalizePath(flatten);
     }
     if (!distDir) {
         throw new Error('could not find dist folder');
@@ -1357,6 +1361,25 @@ async function flatten(pkg, flatten, logger) {
     if (filesAlreadyExist.length) {
         throw new Error(`dist folder cannot be flattened because files already exist: ${filesAlreadyExist.join(', ')}`);
     }
+    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)) {
+        delete pkg.directories.bin;
+        if (Object.keys(pkg.directories).length === 0) {
+            delete pkg.directories;
+        }
+        const files = await readdir(flatten);
+        if (files.length === 1) {
+            const file = files[0];
+            pkg.bin = file;
+        }
+        else {
+            pkg.bin = {};
+            for (const file of files) {
+                pkg.bin[path.basename(file, path.extname(file))] = file;
+            }
+        }
+    }
     // create new directory structure
     const mkdirPromises = [];
     for (const file of filesInDist) {
@@ -1501,6 +1524,8 @@ function getScriptsData() {
     };
 }
 
+// eslint-disable-next-line @typescript-eslint/triple-slash-reference
+/// <reference path="./rollup-plugin-preprocess.d.ts" />
 execute();
 async function execute() {
     const time = Date.now();

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.30.0",
+  "version": "1.31.0",
   "name": "pkgbld",
   "license": "MIT",
   "author": "Konstantin Shutkin",