pkgbld 1.16.7 → 1.17.0

package/README.md

@@ -42,6 +42,10 @@ Run `npm run build`.
 
 ### umd
 
+Defines what subpath exports (entry points) should be compiled as umd bundles.
+
+Example:
+
 ```
 pkgbld --umd=index,core
 ```

package/dist/index.js

@@ -6,7 +6,7 @@ var logger = require('@niceties/logger');
 var rollup = require('rollup');
 var fs = require('fs/promises');
 var path = require('path');
-var minimist = require('minimist');
+var cleye = require('cleye');
 var refiner = require('@slimlib/refine-partition');
 var camelCase = require('lodash/camelCase');
 var kleur = require('kleur');
@@ -43,37 +43,93 @@ const defaults = {
     noTsConfig: false,
     noUpdatePackageJson: false
 };
-function getCliOptions(plugins) {
-    const parsedArgs = minimist(process.argv.slice(2));
-    const umdInputs = parsedArgs.umd?.split(',').map((arg) => arg.trim()) ?? defaults.umdInputs;
-    const compressFormats = parsedArgs.compress?.split(',').map((arg) => arg.trim()) ?? defaults.compressFormats;
-    const sourcemapFormats = parsedArgs.sourcemaps?.split(',').map((arg) => arg.trim()) ?? defaults.sourcemapFormats;
-    const formats = parsedArgs.formats?.split(',').map((arg) => arg.trim()) ?? defaults.formats;
-    const preprocess = parsedArgs.preprocess?.split(',').map((arg) => arg.trim()) ?? defaults.preprocess;
-    const dir = parsedArgs.dir ?? defaults.dir;
-    const sourceDir = parsedArgs.sourceDir ?? defaults.sourceDir;
-    const bin = parsedArgs.bin?.split(',').map((arg) => arg.trim());
-    const includeExternals = parsedArgs['include-externals'] ?? defaults.includeExternals;
-    const eject = !!parsedArgs.eject ?? defaults.eject;
-    const noTsConfig = !!parsedArgs.noTsConfig ?? defaults.noTsConfig;
-    const noUpdatePackageJson = !!parsedArgs.noUpdatePackageJson ?? defaults.noUpdatePackageJson;
+function CommaSeparatedString(value) {
+    return value.split(',').map((arg) => arg.trim());
+}
+function getCliOptions(plugins, pkg) {
+    const cliOptions = cleye.cli({
+        name: 'pkgbld',
+        version: pkg.version ?? '<unknown>',
+        flags: {
+            umd: {
+                type: CommaSeparatedString,
+                description: 'Package subpath exports in UMD format',
+                default: defaults.umdInputs
+            },
+            compress: {
+                type: CommaSeparatedString,
+                description: 'Compress formats using terser',
+                default: defaults.compressFormats
+            },
+            sourcemaps: {
+                type: CommaSeparatedString,
+                description: 'Emit sourcemaps for the specified formats',
+                default: defaults.sourcemapFormats
+            },
+            formats: {
+                type: CommaSeparatedString,
+                description: 'Formats to emit',
+                default: defaults.formats
+            },
+            preprocess: {
+                type: CommaSeparatedString,
+                description: 'Preprocess entry points / subpath exports',
+                default: defaults.preprocess
+            },
+            dir: {
+                type: String,
+                description: 'Output directory',
+                default: defaults.dir
+            },
+            sourceDir: {
+                type: String,
+                description: 'Source directory',
+                default: defaults.sourceDir
+            },
+            bin: {
+                type: CommaSeparatedString,
+                description: 'Executable files'
+            },
+            includeExternals: {
+                type: Boolean,
+                description: 'Include all externals into result bundle(s)',
+                default: defaults.includeExternals
+            },
+            eject: {
+                type: Boolean,
+                description: 'Eject config',
+                default: defaults.includeExternals
+            },
+            noTsConfig: {
+                type: Boolean,
+                description: 'Do not create / update tsconfig.json',
+                default: defaults.noTsConfig
+            },
+            noUpdatePackageJson: {
+                type: Boolean,
+                description: 'Do not create / update package.json',
+                default: defaults.noUpdatePackageJson
+            }
+        }
+    });
+    const flags = cliOptions.flags;
     const options = {
-        umdInputs,
-        compressFormats,
-        sourcemapFormats,
-        formats,
-        formatsOverriden: 'formats' in parsedArgs,
-        preprocess,
-        dir,
-        sourceDir,
-        bin,
-        includeExternals,
-        eject,
-        noTsConfig,
-        noUpdatePackageJson
+        umdInputs: flags.umd,
+        compressFormats: flags.compress,
+        sourcemapFormats: flags.sourcemaps,
+        formats: flags.formats,
+        formatsOverridden: flags.formats !== defaults.formats,
+        preprocess: flags.preprocess,
+        dir: flags.dir,
+        sourceDir: flags.sourceDir,
+        bin: flags.bin,
+        includeExternals: flags.includeExternals,
+        eject: flags.eject,
+        noTsConfig: flags.noTsConfig,
+        noUpdatePackageJson: flags.noUpdatePackageJson
     };
     for (const plugin of plugins) {
-        plugin.options && plugin.options(parsedArgs, options);
+        plugin.options?.(flags, options);
     }
     return options;
 }
@@ -303,19 +359,17 @@ async function getRollupConfigs([provider, plugins$1], inputs, config, helpers,
             if (!plugin.inputs || plugin.inputs.length === 0) {
                 refineNext(doExpandInputs(formats));
             }
+            else if (inputs.length === 1) {
+                refineNext(formats);
+            }
             else {
-                if (inputs.length === 1) {
-                    refineNext(formats);
-                }
-                else {
-                    const expanded = [];
-                    for (const format of formats) {
-                        for (const input of plugin.inputs) {
-                            expanded.push(`${format}.${input}`);
-                        }
+                const expanded = [];
+                for (const format of formats) {
+                    for (const input of plugin.inputs) {
+                        expanded.push(`${format}.${input}`);
                     }
-                    refineNext(expanded);
                 }
+                refineNext(expanded);
             }
         }
     }
@@ -451,9 +505,9 @@ const mainLoggerText = (sourceDir, dir, configsCount, startingTime, finishedCoun
 function processPackage(pkg, config, plugins) {
     const inputs = [];
     const logger$1 = logger.createLogger();
-    const allowEsm = (config.formatsOverriden && config.formats.includes('es') || !config.formatsOverriden);
-    const allowCjs = (config.formatsOverriden && config.formats.includes('cjs') || !config.formatsOverriden);
-    const allowUmd = (config.formatsOverriden && config.formats.includes('umd') || !config.formatsOverriden || config.umdInputs);
+    const allowEsm = (config.formatsOverridden && config.formats.includes('es') || !config.formatsOverridden);
+    const allowCjs = (config.formatsOverridden && config.formats.includes('cjs') || !config.formatsOverridden);
+    const allowUmd = (config.formatsOverridden && config.formats.includes('umd') || !config.formatsOverridden || config.umdInputs);
     if (typeof pkg !== 'object' || Array.isArray(pkg)) {
         logger$1.finish('expecting object on top level of package.json', 3 /* LogLevel.error */);
         process.exit(-1);
@@ -502,13 +556,11 @@ function processPackage(pkg, config, plugins) {
             }
         }
     }
+    else if (typeof pkg.bin === 'string') {
+        config.bin = [pkg.bin];
+    }
     else {
-        if (typeof pkg.bin === 'string') {
-            config.bin = [pkg.bin];
-        }
-        else {
-            delete pkg.bin;
-        }
+        delete pkg.bin;
     }
     if (allowCjs && typeof pkg.main !== 'string') {
         pkg.main = `./${config.dir}/index.cjs`;
@@ -561,7 +613,7 @@ async function writeJson(path, json) {
     await fs.writeFile(path, JSON.stringify(json, null, 2) + '\n');
 }
 
-var version = "1.16.7";
+var version = "1.17.0";
 var license = "MIT";
 var name = "pkgbld";
 var author = "Konstantin Shutkin";
@@ -594,7 +646,7 @@ var scripts = {
 };
 var devDependencies = {
 	"@types/lodash": "^4.14.192",
-	"@types/minimist": "^1.2.2"
+	"@total-typescript/ts-reset": "^0.5.1"
 };
 var dependencies = {
 	"@niceties/logger": "^1.1.10",
@@ -614,11 +666,11 @@ var dependencies = {
 	"@slimlib/smart-mock": "^0.1.2",
 	"is-builtin-module": "^3.2.1",
 	terser: "^5.16.8",
-	minimist: "^1.2.8",
-	kleur: "^4.1.5"
+	kleur: "^4.1.5",
+	cleye: "^1.3.2"
 };
 var peerDependencies = {
-	typescript: "^5.0.2"
+	typescript: "^5.2.2"
 };
 var pkgbldPkg = {
 	version: version,
@@ -763,7 +815,7 @@ async function checkTsConfig(options, mainLogger, plugins) {
     }
     const originalConfig = cloneDeep(config);
     for (const plugin of plugins) {
-        plugin.processTsConfig && plugin.processTsConfig(config);
+        plugin.processTsConfig?.(config);
     }
     if (!isEqual(originalConfig, config)) {
         needWrite = true;
@@ -784,13 +836,16 @@ function loadPlugins(pkg) {
 execute();
 async function execute() {
     const time = Date.now();
-    logger.createLogger().update(' '); // blank line
     const mainLogger = logger.createLogger();
-    mainLogger.update('preparing...');
+    mainLogger.update('preparing..');
     try {
         const [pkgPath, pkg] = await getJson('package.json');
         const plugins = await loadPlugins(pkg);
-        const options = getCliOptions(plugins);
+        mainLogger.update('');
+        process.stdout.moveCursor?.(0, -1);
+        const options = getCliOptions(plugins, pkg);
+        process.stdout.moveCursor?.(0, 1);
+        mainLogger.update('preparing...');
         checkTsConfig(options, mainLogger, plugins);
         const inputs = processPackage(pkg, options, plugins);
         const helpers = getHelpers(pkg.name);

package/dist/src/builtin-plugins/binify.d.ts

@@ -1,3 +1,2 @@
-import { getCliOptions } from '../get-cli-options';
-import { Provider } from '../types';
-export default function (provider: Provider, config: ReturnType<typeof getCliOptions>): Promise<void>;
+import { CliOptions, Provider } from '../types';
+export default function (provider: Provider, config: CliOptions): Promise<void>;

package/dist/src/builtin-plugins/externals.d.ts

@@ -1,3 +1,2 @@
-import { getCliOptions } from '../get-cli-options';
-import { Provider } from '../types';
-export default function (provider: Provider, config: ReturnType<typeof getCliOptions>, inputs: string[]): Promise<void>;
+import { CliOptions, Provider } from '../types';
+export default function (provider: Provider, config: CliOptions, inputs: string[]): Promise<void>;

package/dist/src/builtin-plugins/preprocess.d.ts

@@ -1,3 +1,2 @@
-import { getCliOptions } from '../get-cli-options';
-import { Provider } from '../types';
-export default function (provider: Provider, config: ReturnType<typeof getCliOptions>): Promise<void>;
+import { CliOptions, Provider } from '../types';
+export default function (provider: Provider, config: CliOptions): Promise<void>;

package/dist/src/builtin-plugins/terser.d.ts

@@ -1,3 +1,2 @@
-import { getCliOptions } from '../get-cli-options';
-import { Provider } from '../types';
-export default function (provider: Provider, config: ReturnType<typeof getCliOptions>): Promise<void>;
+import { CliOptions, Provider } from '../types';
+export default function (provider: Provider, config: CliOptions): Promise<void>;

package/dist/src/create-subpackages.d.ts

@@ -1,2 +1,2 @@
-import { getCliOptions } from './get-cli-options';
-export declare function createSubpackages(inputs: string[], config: ReturnType<typeof getCliOptions>): Promise<void>;
+import { CliOptions } from './types';
+export declare function createSubpackages(inputs: string[], config: CliOptions): Promise<void>;

package/dist/src/eject.d.ts

@@ -1,6 +1,5 @@
-import type { PackageJson, PkgbldRollupPlugin, Provider } from './types';
+import type { CliOptions, PackageJson, PkgbldRollupPlugin, Provider } from './types';
 import type { RollupOptions } from 'rollup';
-import { getCliOptions } from './get-cli-options';
 import { getHelpers } from './helpers';
 export declare function createEjectProvider(preimportMap: Map<string, Promise<never>>): Promise<[Provider, PkgbldRollupPlugin[]]>;
-export declare function ejectConfig(config: RollupOptions[], pkgPath: string, options: ReturnType<typeof getCliOptions>, inputs: string[], helpers: ReturnType<typeof getHelpers>, pkg: PackageJson): Promise<void>;
+export declare function ejectConfig(config: RollupOptions[], pkgPath: string, options: CliOptions, inputs: string[], helpers: ReturnType<typeof getHelpers>, pkg: PackageJson): Promise<void>;

package/dist/src/get-cli-options.d.ts

@@ -1,10 +1,10 @@
-import { PkgbldPlugin } from './types';
-export declare function getCliOptions(plugins: Partial<PkgbldPlugin>[]): {
+import { PackageJson, PkgbldPlugin } from './types';
+export declare function getCliOptions(plugins: Partial<PkgbldPlugin>[], pkg: PackageJson): {
     umdInputs: string[];
     compressFormats: string[];
     sourcemapFormats: string[];
     formats: string[];
-    formatsOverriden: boolean;
+    formatsOverridden: boolean;
     preprocess: string[];
     dir: string;
     sourceDir: string;

package/dist/src/get-rollup-configs.d.ts

@@ -1,7 +1,6 @@
-import type { getCliOptions } from './get-cli-options';
 import type { getHelpers } from './helpers';
-import type { PkgbldPlugin, PkgbldRollupPlugin, Provider } from './types';
-export declare function getRollupConfigs([provider, plugins]: [Provider, PkgbldRollupPlugin[]], inputs: string[], config: ReturnType<typeof getCliOptions>, helpers: ReturnType<typeof getHelpers>, externalPlugins: Partial<PkgbldPlugin>[]): Promise<{
+import type { CliOptions, PkgbldPlugin, PkgbldRollupPlugin, Provider } from './types';
+export declare function getRollupConfigs([provider, plugins]: [Provider, PkgbldRollupPlugin[]], inputs: string[], config: CliOptions, helpers: ReturnType<typeof getHelpers>, externalPlugins: Partial<PkgbldPlugin>[]): Promise<{
     input: string[];
     output: {
         amd?: import("rollup").AmdOptions | undefined;

package/dist/src/process-pkg.d.ts

@@ -1,3 +1,2 @@
-import { getCliOptions } from './get-cli-options';
-import { Json, PkgbldPlugin } from './types';
-export declare function processPackage(pkg: Json, config: ReturnType<typeof getCliOptions>, plugins: Partial<PkgbldPlugin>[]): string[];
+import { CliOptions, Json, PkgbldPlugin } from './types';
+export declare function processPackage(pkg: Json, config: CliOptions, plugins: Partial<PkgbldPlugin>[]): string[];

package/dist/src/process-ts-config.d.ts

@@ -1,4 +1,3 @@
 import { Logger } from '@niceties/logger';
-import { getCliOptions } from './get-cli-options';
-import { PkgbldPlugin } from './types';
-export declare function checkTsConfig(options: ReturnType<typeof getCliOptions>, mainLogger: Logger, plugins: Partial<PkgbldPlugin>[]): Promise<void>;
+import { CliOptions, PkgbldPlugin } from './types';
+export declare function checkTsConfig(options: CliOptions, mainLogger: Logger, plugins: Partial<PkgbldPlugin>[]): Promise<void>;

package/dist/src/types.d.ts

@@ -6,6 +6,7 @@ export type Json = null | string | number | boolean | Json[] | {
 };
 export type PackageJson = {
     name: string;
+    version: string;
     dependencies?: Record<string, string>;
     devDependencies?: Record<string, string>;
     peerDependencies: Record<string, string>;
@@ -38,13 +39,13 @@ export type PkgbldRollupPlugin = {
     inputs?: string[];
     outputPlugin?: true;
 };
+export type CliOptions = NonNullable<ReturnType<typeof getCliOptions>>;
+export type ParsedOptions = Record<string, string | number | string[] | number[] | boolean | undefined>;
 export interface PkgbldPlugin {
-    options(parsedArgs: {
-        [key: string]: string | number;
-    }, options: ReturnType<typeof getCliOptions>): void;
+    options(parsedArgs: ParsedOptions, options: CliOptions): void;
     processPackageJson(packageJson: PackageJson, inputs: string[], logger: Logger): void;
     processTsConfig(config: Json): void;
-    providePlugins(provider: Provider, config: Record<string, string | string[] | boolean>, inputs: string[]): Promise<void>;
+    providePlugins(provider: Provider, config: ParsedOptions, inputs: string[]): Promise<void>;
     getExtraOutputSettings(format: InternalModuleFormat, inputs: string[]): Partial<OutputOptions>;
     buildEnd(): Promise<void>;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.16.7",
+  "version": "1.17.0",
   "license": "MIT",
   "name": "pkgbld",
   "author": "Konstantin Shutkin",
@@ -28,7 +28,7 @@
   ],
   "devDependencies": {
     "@types/lodash": "^4.14.192",
-    "@types/minimist": "^1.2.2"
+    "@total-typescript/ts-reset": "^0.5.1"
   },
   "dependencies": {
     "@niceties/logger": "^1.1.10",
@@ -48,11 +48,11 @@
     "@slimlib/smart-mock": "^0.1.2",
     "is-builtin-module": "^3.2.1",
     "terser": "^5.16.8",
-    "minimist": "^1.2.8",
-    "kleur": "^4.1.5"
+    "kleur": "^4.1.5",
+    "cleye": "^1.3.2"
   },
   "peerDependencies": {
-    "typescript": "^5.0.2"
+    "typescript": "^5.2.2"
   },
   "scripts": {
     "build": "rollup -c",