pkgbld 1.9.2 → 1.10.1

package/README.md

@@ -63,7 +63,7 @@ Defines what formats to build, only supports `es` and `cjs` at the moment. Use `
 pkgbld --preprocess=index
 ```
 
-Defines what entry points/files should be preprocessed using `rollup-plugin-preprocess`. For the entry point will be defined variable esm (for esm target) or cjs (for others) depending on the target type. Please request more variables / more granular logic if you want more.
+Defines what entry points/files should be preprocessed using `rollup-plugin-preprocess`. For the entry point will be defined variable es (for esm target), cjs (for commonjs) and umd (for umd) depending on the target type. Please request more variables / more granular logic if you want more.
 
 ### dir
 

package/dist/helpers.d.ts

@@ -8,7 +8,7 @@ export declare function getHelpers(name: string): {
 export declare function umdFilter(config: ReturnType<typeof getCliOptions>, filename: string): boolean;
 export declare function toArray<T>(object: T | T[] | undefined): T[];
 export declare function isExternalInput(id: string, inputs: string | string[], currentInput: string, config: ReturnType<typeof getCliOptions>): boolean;
-export declare function formatInput(input: string[] | string | undefined): string;
+export declare function formatInput(input: string[] | string): string;
 export declare function formatOutput(output: OutputOptions | OutputOptions[] | undefined, field: 'dir' | 'format'): string;
 export declare function getTimeDiff(starting: number): string;
 export declare function getDefaultExport<T extends {

package/dist/index.js

@@ -15,6 +15,7 @@ var rollupPluginTerser = require('rollup-plugin-terser');
 var cleanFactory = require('@rollup-extras/plugin-clean');
 var externals = require('@rollup-extras/plugin-externals');
 var camelCase = require('lodash/camelCase');
+var kleur = require('kleur');
 
 async function createSubpackages(inputs, config) {
     for (const input of inputs) {
@@ -107,15 +108,14 @@ function isExternalInput(id, inputs, currentInput, config) {
     return normalizedPath !== currentInput && inputs.includes(normalizedPath);
 }
 function formatInput(input) {
-    return Array.isArray(input) ? input.join(', ') : (input !== null && input !== void 0 ? input : ''); // not sure if ?? '' needed
+    return (Array.isArray(input) ? input : [input !== null && input !== void 0 ? input : '']).map(item => kleur.magenta(path.basename(item, '.ts'))).join(', ');
 }
 function formatOutput(output, field) {
-    var _a;
     // can we avoid it?
     if (output == null) {
         return '';
     }
-    return Array.isArray(output) ? output.map(item => item[field]).join(', ') : ((_a = output[field]) !== null && _a !== void 0 ? _a : '');
+    return (Array.isArray(output) ? output : [output !== null && output !== void 0 ? output : '']).map(item => kleur.cyan(item[field])).join(', ');
 }
 function getTimeDiff(starting) {
     const now = Date.now();
@@ -128,7 +128,6 @@ function getTimeDiff(starting) {
 const clean = cleanFactory();
 function getBuildPlugins(format, config, inputs, currentInput) {
     const result = [
-        clean,
         externals({
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             external: (id, external) => external || (format === 'umd' ? isExternalInput(id, inputs, currentInput, config) : false)
@@ -138,19 +137,25 @@ function getBuildPlugins(format, config, inputs, currentInput) {
         typescript()
     ];
     if (config.preprocess.length) {
-        const context = { [format == 'es' ? 'esm' : 'cjs']: true };
+        const context = { [format]: true };
         result.unshift(preprocess({ include: config.preprocess.map(name => `${config.sourceDir}/${name}.ts`), context }));
     }
     return result;
 }
 function getOutputPlugins(format, config) {
-    return config.compressTargets.includes(format) ? [rollupPluginTerser.terser({
+    const result = [
+        clean
+    ];
+    if (config.compressTargets.includes(format)) {
+        result.push(rollupPluginTerser.terser({
             mangle: {
                 properties: {
                     regex: /_$/
                 }
             }
-        })] : [];
+        }));
+    }
+    return result;
 }
 
 function getRollupConfigs(inputs, config, helpers) {
@@ -203,6 +208,8 @@ function getRollupConfigs(inputs, config, helpers) {
     return configs;
 }
 
+const mainLoggerText = (sourceDir, dir, configsCount, startingTime, finishedCount = 0) => (final = false) => `${sourceDir} → ${dir} ${final ? configsCount : finishedCount++} / ${configsCount}${final ? (' in ' + getTimeDiff(startingTime)) : ''}`;
+
 function processPackage(pkg, config) {
     var _a;
     const input = [];
@@ -273,27 +280,34 @@ async function writePackage(pkgPath, pkg) {
 }
 
 async function execute() {
+    const time = Date.now();
+    const blank = logger.createLogger();
+    blank.update(' ');
+    const mainLogger = logger.createLogger();
+    mainLogger.update('preparing...');
     try {
         const [pkgPath, pkg] = await getPackage();
-        const config = getCliOptions();
-        const inputs = processPackage(pkg, config);
+        const options = getCliOptions();
+        const inputs = processPackage(pkg, options);
         const helpers = getHelpers(pkg.name);
-        const rollupConfigs = getRollupConfigs(inputs, config, helpers);
-        for (const config of rollupConfigs) {
-            const logger$1 = logger.createLogger();
-            const time = Date.now();
-            logger$1.start(`building ${formatInput(config.input)} → ${formatOutput(config.output, 'dir')}, ${formatOutput(config.output, 'format')}`, 1 /* LogLevel.info */);
-            const bundle = await rollup.rollup(config);
-            await Promise.all(toArray(config.output).map(config => bundle.write(config)));
-            await bundle.close();
-            logger$1.finish(`finished ${formatInput(config.input)} → ${formatOutput(config.output, 'dir')}, ${formatOutput(config.output, 'format')} in ${getTimeDiff(time)}`, 1 /* LogLevel.info */);
-        }
+        const rollupConfigs = getRollupConfigs(inputs, options, helpers);
+        const updater = mainLoggerText(options.sourceDir, options.dir, rollupConfigs.length, time);
+        mainLogger.start(updater());
+        await Promise.all(rollupConfigs.map(config => buildConfig(config, updater)));
         await writePackage(pkgPath, pkg);
-        await createSubpackages(inputs, config);
+        await createSubpackages(inputs, options);
+        mainLogger.finish(updater(true));
     }
     catch (e) {
-        logger.createLogger().finish(`${e}}`, 3 /* LogLevel.error */);
+        mainLogger.finish(`${e}}`, 3 /* LogLevel.error */);
         process.exit(-1);
     }
+    async function buildConfig(config, updater) {
+        const bundle = await rollup.rollup(config);
+        await Promise.all(toArray(config.output).map(config => bundle.write(config)));
+        await bundle.close();
+        mainLogger(`${kleur.green('✓')} ${formatInput(config.input)} [${formatOutput(config.output, 'format')}]`);
+        mainLogger.update(updater());
+    }
 }
 execute();

package/dist/messages.d.ts

@@ -0,0 +1 @@
+export declare const mainLoggerText: (sourceDir: string, dir: string, configsCount: number, startingTime: number, finishedCount?: number) => (final?: boolean) => string;

package/dist/types.d.ts

@@ -2,6 +2,6 @@ export interface Replacer {
     name: string;
     used: () => void;
 }
-export declare type Json = null | string | number | boolean | Json[] | {
+export type Json = null | string | number | boolean | Json[] | {
     [name: string]: Json;
 };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.9.2",
+  "version": "1.10.1",
   "license": "MIT",
   "name": "pkgbld",
   "author": {
@@ -39,32 +39,33 @@
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "9.0.1",
     "@semantic-release/release-notes-generator": "10.0.3",
-    "@types/lodash": "4.14.186",
-    "@typescript-eslint/eslint-plugin": "5.41.0",
-    "@typescript-eslint/parser": "5.41.0",
+    "@types/lodash": "4.14.190",
+    "@typescript-eslint/eslint-plugin": "5.44.0",
+    "@typescript-eslint/parser": "5.44.0",
     "conventional-changelog-angular": "5.0.13",
-    "eslint": "8.26.0",
+    "eslint": "8.28.0",
     "semantic-release": "19.0.5",
-    "@rollup-extras/plugin-binify": "1.1.3"
+    "@rollup-extras/plugin-binify": "1.1.4"
   },
   "dependencies": {
-    "@niceties/logger": "1.1.9",
-    "@niceties/draftlog-appender": "1.2.7",
+    "@niceties/logger": "1.1.10",
+    "@niceties/draftlog-appender": "1.3.0",
     "lodash": "4.17.21",
-    "rollup": "3.2.5",
+    "rollup": "3.4.0",
     "rollup-plugin-terser": "7.0.2",
     "rollup-plugin-typescript2": "0.34.1",
     "rollup-plugin-preprocess": "0.0.4",
     "@rollup/plugin-commonjs": "23.0.2",
     "@rollup/plugin-node-resolve": "15.0.1",
-    "@rollup-extras/plugin-clean": "1.3.2",
-    "@rollup-extras/plugin-externals": "1.1.3",
-    "typescript": "4.8.4",
-    "minimist": "1.2.7"
+    "@rollup-extras/plugin-clean": "1.3.3",
+    "@rollup-extras/plugin-externals": "1.1.4",
+    "typescript": "4.9.3",
+    "minimist": "1.2.7",
+    "kleur": "4.1.5"
   },
   "overrides": {
     "rollup-plugin-terser@7.0.2": {
-      "rollup": "3.2.5"
+      "rollup": "3.4.0"
     }
   }
 }