@rollup-extras/plugin-html 1.2.4 → 1.3.1

package/dist/index.cjs

@@ -3,16 +3,67 @@
 var fs = require('fs/promises');
 var oldStyleFs = require('fs');
 var path = require('path');
-var options = require('@rollup-extras/utils/options');
-var logger = require('@rollup-extras/utils/logger');
-var mutliConfigPluginBase = require('@rollup-extras/utils/mutli-config-plugin-base');
+var logger$1 = require('@niceties/logger');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+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 logger (options) {
+    return logger$1.createLogger(options.pluginName);
+}
 
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
-var oldStyleFs__default = /*#__PURE__*/_interopDefaultLegacy(oldStyleFs);
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var logger__default = /*#__PURE__*/_interopDefaultLegacy(logger);
+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);
+                }
+            }
+        }
+    }
+}
 
 const defaultTemplate = '<!DOCTYPE html><html><head></head><body></body></html>';
 const headClosingElement = '</head>';
@@ -28,9 +79,9 @@ const defaults = {
     ignore: toAssetPredicate(false),
     templateFactory: ((template, assets, defaultTemplateFactory) => defaultTemplateFactory(template, assets))
 };
-const factories = { logger: logger__default["default"], injectIntoHead: predicateFactory, ignore: predicateFactory };
-function index (options$1 = {}) {
-    const { pluginName, outputFile, template, watch, emitFile, conditionalLoading, logger, useWriteBundle, logLevel, useEmittedTemplate, injectIntoHead, ignore, assetsFactory, templateFactory } = options.getOptionsObject(options$1, Object.assign(Object.assign({}, defaults), { useEmittedTemplate: !('template' in options$1), logLevel: options$1.verbose ? 1 /* info */ : 0 /* verbose */ }), factories), hasCustomTemplateFactory = 'templateFactory' in options$1;
+const factories = { logger, injectIntoHead: predicateFactory, ignore: predicateFactory };
+function index (options = {}) {
+    const { pluginName, outputFile, template, watch, emitFile, conditionalLoading, logger, useWriteBundle, logLevel, useEmittedTemplate, injectIntoHead, ignore, assetsFactory, templateFactory } = getOptionsObject(options, Object.assign(Object.assign({}, defaults), { useEmittedTemplate: !('template' in options), logLevel: options.verbose ? 1 /* LogLevel.info */ : 0 /* LogLevel.verbose */ }), factories), hasCustomTemplateFactory = 'templateFactory' in options;
     let templateString = defaultTemplate, hasTemplateFile = false;
     if (template) {
         if (isUsableByDefaultTemplateFactory(template)) {
@@ -40,7 +91,7 @@ function index (options$1 = {}) {
             if (watch) {
                 try {
                     // using sync fs call because we need to return plugin object immidiately
-                    useNewTemplate(oldStyleFs__default["default"].readFileSync(template, { encoding: 'utf8' }));
+                    useNewTemplate(oldStyleFs.readFileSync(template, { encoding: 'utf8' }));
                     hasTemplateFile = true;
                 }
                 catch (e) {
@@ -49,7 +100,7 @@ function index (options$1 = {}) {
             }
             else {
                 templateString = new Promise(resolve => {
-                    fs__default["default"].readFile(template, { encoding: 'utf8' })
+                    fs.readFile(template, { encoding: 'utf8' })
                         .then((newTemplateString) => {
                         if (!isUsableByDefaultTemplateFactory(newTemplateString) && !hasCustomTemplateFactory) {
                             warnAboutUsingDefaultTemplate();
@@ -66,13 +117,13 @@ function index (options$1 = {}) {
     }
     let initialDir = '', fileNameInInitialDir, assets = freshAssets();
     const processedFiles = new Set();
-    const instance = mutliConfigPluginBase.multiConfigPluginBase(useWriteBundle, pluginName, generateBundle, updateAssets);
+    const instance = multiConfigPluginBase(useWriteBundle, pluginName, generateBundle, updateAssets);
     const baseRenderStart = instance.renderStart;
     const baseAddInstance = instance.api.addInstance;
     instance.renderStart = function (outputOptions, inputOptions) {
-        logger('started collecting information', 0 /* verbose */);
+        logger('started collecting information', 0 /* LogLevel.verbose */);
         initialDir = outputOptions.dir || '';
-        fileNameInInitialDir = path__default["default"].join(initialDir, outputFile);
+        fileNameInInitialDir = path.join(initialDir, outputFile);
         return baseRenderStart.call(this, outputOptions, inputOptions);
     };
     instance.api.addInstance = () => {
@@ -85,7 +136,7 @@ function index (options$1 = {}) {
     if (hasTemplateFile && watch) {
         instance.buildStart = async function () {
             try {
-                useNewTemplate(await fs__default["default"].readFile(template, { encoding: 'utf8' }));
+                useNewTemplate(await fs.readFile(template, { encoding: 'utf8' }));
             }
             catch (e) {
                 handleTemplateReadError(e);
@@ -101,16 +152,16 @@ function index (options$1 = {}) {
             .filter(item => item.count)
             .map(({ key, count }) => `${key}: ${count}`)
             .join(', ');
-        logger(`assets collected: [${statistics}], remaining: ${remainingOutputsCount} outputs, ${remainingConfigsCount} configs`, 0 /* verbose */);
-        const dir = options.dir || '', fileName = path__default["default"].relative(dir, fileNameInInitialDir);
+        logger(`assets collected: [${statistics}], remaining: ${remainingOutputsCount} outputs, ${remainingConfigsCount} configs`, 0 /* LogLevel.verbose */);
+        const dir = options.dir || '', fileName = path.relative(dir, fileNameInInitialDir);
         if (fileName in bundle) {
             if (useEmittedTemplate) {
-                logger(`using exiting emitted ${fileName} as an input for out templateFactory`, 0 /* verbose */);
+                logger(`using exiting emitted ${fileName} as an input for out templateFactory`, 0 /* LogLevel.verbose */);
                 const source = bundle[fileName].type === 'asset' ? bundle[fileName].source.toString() : bundle[fileName].code;
                 useNewTemplate(source);
             }
             else {
-                logger(`removing exiting emitted ${fileName}`, 0 /* verbose */);
+                logger(`removing exiting emitted ${fileName}`, 0 /* LogLevel.verbose */);
             }
             if (remainingConfigsCount === 0 && emitFile && !useWriteBundle) {
                 delete bundle[fileName];
@@ -135,14 +186,14 @@ function index (options$1 = {}) {
     }
     function handleTemplateReadError(e) {
         if ((e === null || e === void 0 ? void 0 : e.code) === 'ENOENT') {
-            logger('template nor a file or string', 2 /* warn */, e);
+            logger('template nor a file or string', 2 /* LogLevel.warn */, e);
         }
         else {
-            logger('error reading template', 2 /* warn */, e);
+            logger('error reading template', 2 /* LogLevel.warn */, e);
         }
     }
     function warnAboutUsingDefaultTemplate() {
-        logger('template is unusable by default template factory, using default one', 2 /* warn */);
+        logger('template is unusable by default template factory, using default one', 2 /* LogLevel.warn */);
     }
     async function buildStart() {
         this.addWatchFile(template);
@@ -150,14 +201,14 @@ function index (options$1 = {}) {
     async function generateBundle(options) {
         logger.start('generating html', logLevel);
         try {
-            const dir = options.dir || '', fileName = path__default["default"].relative(dir, fileNameInInitialDir);
+            const dir = options.dir || '', fileName = path.relative(dir, fileNameInInitialDir);
             const depromisifiedTemplateString = await templateString, source = await templateFactory(depromisifiedTemplateString, assets, defaultTemplateFactory);
             if (!emitFile || fileName.startsWith('..') || useWriteBundle) {
                 if (emitFile && emitFile !== 'auto') {
-                    logger('cannot emitFile because it is outside of current output.dir, using writeFile instead', 0 /* verbose */);
+                    logger('cannot emitFile because it is outside of current output.dir, using writeFile instead', 0 /* LogLevel.verbose */);
                 }
-                await fs__default["default"].mkdir(path__default["default"].dirname(fileNameInInitialDir), { recursive: true });
-                await fs__default["default"].writeFile(fileNameInInitialDir, source);
+                await fs.mkdir(path.dirname(fileNameInInitialDir), { recursive: true });
+                await fs.writeFile(fileNameInInitialDir, source);
             }
             else {
                 this.emitFile({
@@ -172,13 +223,13 @@ function index (options$1 = {}) {
             logger.finish('html file generated');
         }
         catch (e) {
-            logger.finish('html generation failed', 3 /* error */, e);
+            logger.finish('html generation failed', 3 /* LogLevel.error */, e);
         }
     }
     async function getAssets(options, bundle) {
         const dir = options.dir || '';
         for (const fileName of Object.keys(bundle)) {
-            const relativeToRootAssetPath = path__default["default"].join(dir, fileName);
+            const relativeToRootAssetPath = path.join(dir, fileName);
             if (ignore(relativeToRootAssetPath) || processedFiles.has(relativeToRootAssetPath)) {
                 continue;
             }
@@ -188,7 +239,7 @@ function index (options$1 = {}) {
                     continue;
                 }
                 if (fileName.endsWith(cssExtention)) {
-                    const assetPath = path__default["default"].relative(initialDir, relativeToRootAssetPath);
+                    const assetPath = path.relative(initialDir, relativeToRootAssetPath);
                     assets.asset.push({
                         html: getLinkElement(assetPath),
                         head: injectIntoHead(relativeToRootAssetPath),
@@ -204,14 +255,14 @@ function index (options$1 = {}) {
                         continue;
                     }
                     if (options.format === 'es' || options.format === 'iife' || options.format === 'umd') {
-                        const assetPath = path__default["default"].relative(initialDir, relativeToRootAssetPath);
+                        const assetPath = path.relative(initialDir, relativeToRootAssetPath);
                         assets[options.format].push({
                             html: (assets) => {
                                 let useConditionalLoading = conditionalLoading;
                                 useConditionalLoading !== null && useConditionalLoading !== void 0 ? useConditionalLoading : (useConditionalLoading = !!((assets.iife.length
                                     || assets.umd.length)
                                     && assets.es.length));
-                                return (options.format === 'iife' || options.format === 'umd') ? getNonModuleScriptElement(assetPath, useConditionalLoading) : getModuleScriptElement(assetPath);
+                                return (options.format === 'iife' || options.format === 'umd') ? getNonModuleScriptElement(assetPath, !!useConditionalLoading) : getModuleScriptElement(assetPath);
                             },
                             head: injectIntoHead(relativeToRootAssetPath),
                             type: 'asset'
@@ -241,7 +292,7 @@ function index (options$1 = {}) {
                 }
             }
             catch (e) {
-                logger('exception in assetFactory', 2 /* warn */, e);
+                logger('exception in assetFactory', 2 /* LogLevel.warn */, e);
             }
         }
         return false;
@@ -266,7 +317,7 @@ function predicateFactory(options, field) {
             return predicate;
         }
         else {
-            options.logger && options.logger(`${field} option ignored because it is not a function, RegExp or boolean`, 2 /* warn */);
+            options.logger && options.logger(`${field} option ignored because it is not a function, RegExp or boolean`, 2 /* LogLevel.warn */);
         }
     }
     return defaults[field];

package/dist/index.mjs

@@ -1,9 +1,67 @@
 import fs from 'fs/promises';
 import oldStyleFs from 'fs';
 import path from 'path';
-import { getOptionsObject } from '@rollup-extras/utils/options';
-import logger from '@rollup-extras/utils/logger';
-import { multiConfigPluginBase } from '@rollup-extras/utils/mutli-config-plugin-base';
+import { createLogger } from '@niceties/logger';
+
+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 logger (options) {
+    return createLogger(options.pluginName);
+}
+
+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);
+                }
+            }
+        }
+    }
+}
 
 const defaultTemplate = '<!DOCTYPE html><html><head></head><body></body></html>';
 const headClosingElement = '</head>';
@@ -21,7 +79,7 @@ const defaults = {
 };
 const factories = { logger, injectIntoHead: predicateFactory, ignore: predicateFactory };
 function index (options = {}) {
-    const { pluginName, outputFile, template, watch, emitFile, conditionalLoading, logger, useWriteBundle, logLevel, useEmittedTemplate, injectIntoHead, ignore, assetsFactory, templateFactory } = getOptionsObject(options, Object.assign(Object.assign({}, defaults), { useEmittedTemplate: !('template' in options), logLevel: options.verbose ? 1 /* info */ : 0 /* verbose */ }), factories), hasCustomTemplateFactory = 'templateFactory' in options;
+    const { pluginName, outputFile, template, watch, emitFile, conditionalLoading, logger, useWriteBundle, logLevel, useEmittedTemplate, injectIntoHead, ignore, assetsFactory, templateFactory } = getOptionsObject(options, Object.assign(Object.assign({}, defaults), { useEmittedTemplate: !('template' in options), logLevel: options.verbose ? 1 /* LogLevel.info */ : 0 /* LogLevel.verbose */ }), factories), hasCustomTemplateFactory = 'templateFactory' in options;
     let templateString = defaultTemplate, hasTemplateFile = false;
     if (template) {
         if (isUsableByDefaultTemplateFactory(template)) {
@@ -61,7 +119,7 @@ function index (options = {}) {
     const baseRenderStart = instance.renderStart;
     const baseAddInstance = instance.api.addInstance;
     instance.renderStart = function (outputOptions, inputOptions) {
-        logger('started collecting information', 0 /* verbose */);
+        logger('started collecting information', 0 /* LogLevel.verbose */);
         initialDir = outputOptions.dir || '';
         fileNameInInitialDir = path.join(initialDir, outputFile);
         return baseRenderStart.call(this, outputOptions, inputOptions);
@@ -92,16 +150,16 @@ function index (options = {}) {
             .filter(item => item.count)
             .map(({ key, count }) => `${key}: ${count}`)
             .join(', ');
-        logger(`assets collected: [${statistics}], remaining: ${remainingOutputsCount} outputs, ${remainingConfigsCount} configs`, 0 /* verbose */);
+        logger(`assets collected: [${statistics}], remaining: ${remainingOutputsCount} outputs, ${remainingConfigsCount} configs`, 0 /* LogLevel.verbose */);
         const dir = options.dir || '', fileName = path.relative(dir, fileNameInInitialDir);
         if (fileName in bundle) {
             if (useEmittedTemplate) {
-                logger(`using exiting emitted ${fileName} as an input for out templateFactory`, 0 /* verbose */);
+                logger(`using exiting emitted ${fileName} as an input for out templateFactory`, 0 /* LogLevel.verbose */);
                 const source = bundle[fileName].type === 'asset' ? bundle[fileName].source.toString() : bundle[fileName].code;
                 useNewTemplate(source);
             }
             else {
-                logger(`removing exiting emitted ${fileName}`, 0 /* verbose */);
+                logger(`removing exiting emitted ${fileName}`, 0 /* LogLevel.verbose */);
             }
             if (remainingConfigsCount === 0 && emitFile && !useWriteBundle) {
                 delete bundle[fileName];
@@ -126,14 +184,14 @@ function index (options = {}) {
     }
     function handleTemplateReadError(e) {
         if ((e === null || e === void 0 ? void 0 : e.code) === 'ENOENT') {
-            logger('template nor a file or string', 2 /* warn */, e);
+            logger('template nor a file or string', 2 /* LogLevel.warn */, e);
         }
         else {
-            logger('error reading template', 2 /* warn */, e);
+            logger('error reading template', 2 /* LogLevel.warn */, e);
         }
     }
     function warnAboutUsingDefaultTemplate() {
-        logger('template is unusable by default template factory, using default one', 2 /* warn */);
+        logger('template is unusable by default template factory, using default one', 2 /* LogLevel.warn */);
     }
     async function buildStart() {
         this.addWatchFile(template);
@@ -145,7 +203,7 @@ function index (options = {}) {
             const depromisifiedTemplateString = await templateString, source = await templateFactory(depromisifiedTemplateString, assets, defaultTemplateFactory);
             if (!emitFile || fileName.startsWith('..') || useWriteBundle) {
                 if (emitFile && emitFile !== 'auto') {
-                    logger('cannot emitFile because it is outside of current output.dir, using writeFile instead', 0 /* verbose */);
+                    logger('cannot emitFile because it is outside of current output.dir, using writeFile instead', 0 /* LogLevel.verbose */);
                 }
                 await fs.mkdir(path.dirname(fileNameInInitialDir), { recursive: true });
                 await fs.writeFile(fileNameInInitialDir, source);
@@ -163,7 +221,7 @@ function index (options = {}) {
             logger.finish('html file generated');
         }
         catch (e) {
-            logger.finish('html generation failed', 3 /* error */, e);
+            logger.finish('html generation failed', 3 /* LogLevel.error */, e);
         }
     }
     async function getAssets(options, bundle) {
@@ -202,7 +260,7 @@ function index (options = {}) {
                                 useConditionalLoading !== null && useConditionalLoading !== void 0 ? useConditionalLoading : (useConditionalLoading = !!((assets.iife.length
                                     || assets.umd.length)
                                     && assets.es.length));
-                                return (options.format === 'iife' || options.format === 'umd') ? getNonModuleScriptElement(assetPath, useConditionalLoading) : getModuleScriptElement(assetPath);
+                                return (options.format === 'iife' || options.format === 'umd') ? getNonModuleScriptElement(assetPath, !!useConditionalLoading) : getModuleScriptElement(assetPath);
                             },
                             head: injectIntoHead(relativeToRootAssetPath),
                             type: 'asset'
@@ -232,7 +290,7 @@ function index (options = {}) {
                 }
             }
             catch (e) {
-                logger('exception in assetFactory', 2 /* warn */, e);
+                logger('exception in assetFactory', 2 /* LogLevel.warn */, e);
             }
         }
         return false;
@@ -257,7 +315,7 @@ function predicateFactory(options, field) {
             return predicate;
         }
         else {
-            options.logger && options.logger(`${field} option ignored because it is not a function, RegExp or boolean`, 2 /* warn */);
+            options.logger && options.logger(`${field} option ignored because it is not a function, RegExp or boolean`, 2 /* LogLevel.warn */);
         }
     }
     return defaults[field];

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.4",
+  "version": "1.3.1",
   "license": "MIT",
   "name": "@rollup-extras/plugin-html",
   "author": {
@@ -38,7 +38,7 @@
     "bundle"
   ],
   "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"
+    "rollup": "^2.60.1 || ^3.0.0"
   },
   "dependencies": {
-    "@niceties/logger": "^1.1.3",
-    "@rollup-extras/utils": "^1.2.4"
+    "@niceties/logger": "^1.1.4",
+    "@rollup-extras/utils": "^1.3.1"
   }
 }