@rollup-extras/plugin-clean 1.3.0 → 1.3.1

package/dist/index.cjs

@@ -3,19 +3,86 @@
 var fs = require('fs/promises');
 var path = require('path');
 var logger = require('@niceties/logger');
-var options = require('@rollup-extras/utils/options');
-var mutliConfigPluginBase = require('@rollup-extras/utils/mutli-config-plugin-base');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+function getOptions(options, defaults, field, factory) {
+    const newOptions = recursiveArrayOptions(options, field);
+    return getOptionsObject((newOptions ? newOptions : options), defaults, factory);
+}
+function recursiveArrayOptions(options, field) {
+    if (typeof options === 'string') {
+        return { [field]: [options] };
+    }
+    else if (Array.isArray(options)) {
+        return { [field]: options };
+    }
+    else if (typeof options === 'object') {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return field in options ? Object.assign(Object.assign({}, options), recursiveArrayOptions(options[field], field)) : options;
+    }
+    console.warn(`cannot process options: '${options}', reverting to defaults`);
+    return undefined;
+}
+function getOptionsObject(options, defaults, factory) {
+    const result = Object.assign(Object.assign({}, defaults), options);
+    if (factory) {
+        for (const [k, v] of Object.entries(factory)) {
+            result[k] = v(result, k);
+        }
+    }
+    return result;
+}
 
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
+function multiConfigPluginBase(useWriteBundle, pluginName, execute, onFinalHook) {
+    const finalHook = useWriteBundle ? 'writeBundle' : 'generateBundle';
+    let remainingOutputsCount = 0, configsCount = 0;
+    const configs = new Set();
+    const instance = {
+        name: pluginName,
+        renderStart,
+        [finalHook]: writeBundle,
+        api: { addInstance }
+    };
+    return instance;
+    function addInstance() {
+        const configId = ++configsCount;
+        configs.add(configId);
+        return {
+            name: `${pluginName}#${configId}`,
+            renderStart: () => {
+                configs.delete(configId);
+                return renderStart();
+            },
+            [finalHook]: writeBundle
+        };
+    }
+    function renderStart() {
+        ++remainingOutputsCount;
+    }
+    async function writeBundle(options, bundle) {
+        --remainingOutputsCount;
+        if (onFinalHook) {
+            await onFinalHook.call(this, options, bundle, configs.size, remainingOutputsCount);
+        }
+        if (configs.size === 0 && remainingOutputsCount === 0) {
+            // do work
+            try {
+                await execute.call(this, options, bundle);
+            }
+            finally {
+                // reset configs
+                for (let i = configsCount; i > 0; --i) {
+                    configs.add(i);
+                }
+            }
+        }
+    }
+}
 
-function index (options$1 = {}) {
+function index (options = {}) {
     const inProgress = new Map();
     const hasChildrenInProgress = new Map();
     let deleted = false;
-    const normalizedOptions = options.getOptions(options$1, {
+    const normalizedOptions = getOptions(options, {
         pluginName: '@rollup-extras/plugin-clean',
         deleteOnce: true,
         verbose: false,
@@ -23,7 +90,7 @@ function index (options$1 = {}) {
     }, 'targets');
     const { pluginName, deleteOnce, verbose, outputPlugin } = normalizedOptions;
     let { targets } = normalizedOptions;
-    const instance = mutliConfigPluginBase.multiConfigPluginBase(false, pluginName, cleanup);
+    const instance = multiConfigPluginBase(false, pluginName, cleanup);
     const baseAddInstance = instance.api.addInstance;
     const baseRenderStart = instance.renderStart;
     if (outputPlugin) {
@@ -82,7 +149,7 @@ function index (options$1 = {}) {
         }
     }
     async function removeDir(dir) {
-        const normalizedDir = normalizeSlash(path__default["default"].normalize(dir));
+        const normalizedDir = normalizeSlash(path.normalize(dir));
         if (inProgress.has(normalizedDir)) {
             return outputPlugin && inProgress.get(normalizedDir);
         }
@@ -112,12 +179,12 @@ function index (options$1 = {}) {
     async function doRemove(normalizedDir) {
         const logger$1 = logger.createLogger(pluginName);
         try {
-            logger$1.start(`cleaning '${normalizedDir}'`, verbose ? 1 /* info */ : 0 /* verbose */);
-            await fs__default["default"].rm(normalizedDir, { recursive: true });
+            logger$1.start(`cleaning '${normalizedDir}'`, verbose ? 1 /* LogLevel.info */ : 0 /* LogLevel.verbose */);
+            await fs.rm(normalizedDir, { recursive: true });
             logger$1.finish(`cleaned '${normalizedDir}'`);
         }
         catch (e) { // eslint-disable-line @typescript-eslint/no-explicit-any
-            const loglevel = e['code'] === 'ENOENT' ? undefined : 2 /* warn */;
+            const loglevel = e['code'] === 'ENOENT' ? undefined : 2 /* LogLevel.warn */;
             logger$1.finish(`failed cleaning '${normalizedDir}'`, loglevel, e);
         }
     }
@@ -134,7 +201,7 @@ function normalizeSlash(dir) {
     return dir;
 }
 function* parentDirs(dir) {
-    while (((dir = path__default["default"].dirname(dir)) !== '.') && (dir !== '/')) {
+    while (((dir = path.dirname(dir)) !== '.') && (dir !== '/')) {
         yield dir;
     }
 }

package/dist/index.mjs

@@ -1,8 +1,80 @@
 import fs from 'fs/promises';
 import path from 'path';
 import { createLogger } from '@niceties/logger';
-import { getOptions } from '@rollup-extras/utils/options';
-import { multiConfigPluginBase } from '@rollup-extras/utils/mutli-config-plugin-base';
+
+function getOptions(options, defaults, field, factory) {
+    const newOptions = recursiveArrayOptions(options, field);
+    return getOptionsObject((newOptions ? newOptions : options), defaults, factory);
+}
+function recursiveArrayOptions(options, field) {
+    if (typeof options === 'string') {
+        return { [field]: [options] };
+    }
+    else if (Array.isArray(options)) {
+        return { [field]: options };
+    }
+    else if (typeof options === 'object') {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return field in options ? Object.assign(Object.assign({}, options), recursiveArrayOptions(options[field], field)) : options;
+    }
+    console.warn(`cannot process options: '${options}', reverting to defaults`);
+    return undefined;
+}
+function getOptionsObject(options, defaults, factory) {
+    const result = Object.assign(Object.assign({}, defaults), options);
+    if (factory) {
+        for (const [k, v] of Object.entries(factory)) {
+            result[k] = v(result, k);
+        }
+    }
+    return result;
+}
+
+function multiConfigPluginBase(useWriteBundle, pluginName, execute, onFinalHook) {
+    const finalHook = useWriteBundle ? 'writeBundle' : 'generateBundle';
+    let remainingOutputsCount = 0, configsCount = 0;
+    const configs = new Set();
+    const instance = {
+        name: pluginName,
+        renderStart,
+        [finalHook]: writeBundle,
+        api: { addInstance }
+    };
+    return instance;
+    function addInstance() {
+        const configId = ++configsCount;
+        configs.add(configId);
+        return {
+            name: `${pluginName}#${configId}`,
+            renderStart: () => {
+                configs.delete(configId);
+                return renderStart();
+            },
+            [finalHook]: writeBundle
+        };
+    }
+    function renderStart() {
+        ++remainingOutputsCount;
+    }
+    async function writeBundle(options, bundle) {
+        --remainingOutputsCount;
+        if (onFinalHook) {
+            await onFinalHook.call(this, options, bundle, configs.size, remainingOutputsCount);
+        }
+        if (configs.size === 0 && remainingOutputsCount === 0) {
+            // do work
+            try {
+                await execute.call(this, options, bundle);
+            }
+            finally {
+                // reset configs
+                for (let i = configsCount; i > 0; --i) {
+                    configs.add(i);
+                }
+            }
+        }
+    }
+}
 
 function index (options = {}) {
     const inProgress = new Map();
@@ -105,12 +177,12 @@ function index (options = {}) {
     async function doRemove(normalizedDir) {
         const logger = createLogger(pluginName);
         try {
-            logger.start(`cleaning '${normalizedDir}'`, verbose ? 1 /* info */ : 0 /* verbose */);
+            logger.start(`cleaning '${normalizedDir}'`, verbose ? 1 /* LogLevel.info */ : 0 /* LogLevel.verbose */);
             await fs.rm(normalizedDir, { recursive: true });
             logger.finish(`cleaned '${normalizedDir}'`);
         }
         catch (e) { // eslint-disable-line @typescript-eslint/no-explicit-any
-            const loglevel = e['code'] === 'ENOENT' ? undefined : 2 /* warn */;
+            const loglevel = e['code'] === 'ENOENT' ? undefined : 2 /* LogLevel.warn */;
             logger.finish(`failed cleaning '${normalizedDir}'`, loglevel, e);
         }
     }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0",
+  "version": "1.3.1",
   "license": "MIT",
   "name": "@rollup-extras/plugin-clean",
   "author": {
@@ -38,7 +38,7 @@
     "delete"
   ],
   "scripts": {
-    "build": "pkgbld",
+    "build": "pkgbld-internal",
     "test": "jest --collectCoverage",
     "lint": "eslint ./src",
     "semantic-release": "npx semantic-release"
@@ -60,13 +60,13 @@
     "ts-jest": "28.0.2",
     "typescript": "4.6.x",
     "update-monorepo-package-json": "0.2.0",
-    "pkgbld": "1.2.12"
+    "pkgbld-internal": "1.0.2"
   },
   "peerDependencies": {
     "rollup": "^2.60.1 || ^3.0.0"
   },
   "dependencies": {
     "@niceties/logger": "^1.1.4",
-    "@rollup-extras/utils": "^1.3.0"
+    "@rollup-extras/utils": "^1.3.1"
   }
 }