@rollup-extras/plugin-html 1.3.1 → 1.3.3

package/dist/index.cjs

@@ -3,67 +3,9 @@
 var fs = require('fs/promises');
 var oldStyleFs = require('fs');
 var path = require('path');
-var logger$1 = require('@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 logger$1.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);
-                }
-            }
-        }
-    }
-}
+var options = require('@rollup-extras/utils/options');
+var logger = require('@rollup-extras/utils/logger');
+var mutliConfigPluginBase = require('@rollup-extras/utils/mutli-config-plugin-base');
 
 const defaultTemplate = '<!DOCTYPE html><html><head></head><body></body></html>';
 const headClosingElement = '</head>';
@@ -80,8 +22,8 @@ const defaults = {
     templateFactory: ((template, assets, defaultTemplateFactory) => defaultTemplateFactory(template, assets))
 };
 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;
+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 /* LogLevel.info */ : 0 /* LogLevel.verbose */ }), factories), hasCustomTemplateFactory = 'templateFactory' in options$1;
     let templateString = defaultTemplate, hasTemplateFile = false;
     if (template) {
         if (isUsableByDefaultTemplateFactory(template)) {
@@ -117,7 +59,7 @@ function index (options = {}) {
     }
     let initialDir = '', fileNameInInitialDir, assets = freshAssets();
     const processedFiles = new Set();
-    const instance = multiConfigPluginBase(useWriteBundle, pluginName, generateBundle, updateAssets);
+    const instance = mutliConfigPluginBase.multiConfigPluginBase(useWriteBundle, pluginName, generateBundle, updateAssets);
     const baseRenderStart = instance.renderStart;
     const baseAddInstance = instance.api.addInstance;
     instance.renderStart = function (outputOptions, inputOptions) {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { PluginHooks } from 'rollup';
+import { Plugin } from 'rollup';
 import { HtmlPluginOptions } from './types';
-export default function (options?: HtmlPluginOptions): Partial<PluginHooks> & {
+export default function (options?: HtmlPluginOptions): Plugin & {
     api: {
-        addInstance(): void;
+        addInstance(): Plugin;
     };
 };

package/dist/index.mjs

@@ -1,67 +1,9 @@
 import fs from 'fs/promises';
 import oldStyleFs from 'fs';
 import path from 'path';
-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);
-                }
-            }
-        }
-    }
-}
+import { getOptionsObject } from '@rollup-extras/utils/options';
+import logger from '@rollup-extras/utils/logger';
+import { multiConfigPluginBase } from '@rollup-extras/utils/mutli-config-plugin-base';
 
 const defaultTemplate = '<!DOCTYPE html><html><head></head><body></body></html>';
 const headClosingElement = '</head>';

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.1",
+  "version": "1.3.3",
   "license": "MIT",
   "name": "@rollup-extras/plugin-html",
   "author": {
@@ -60,13 +60,13 @@
     "ts-jest": "28.0.2",
     "typescript": "4.6.x",
     "update-monorepo-package-json": "0.2.0",
-    "pkgbld-internal": "1.0.2"
+    "pkgbld-internal": "1.0.3"
   },
   "peerDependencies": {
     "rollup": "^2.60.1 || ^3.0.0"
   },
   "dependencies": {
     "@niceties/logger": "^1.1.4",
-    "@rollup-extras/utils": "^1.3.1"
+    "@rollup-extras/utils": "^1.3.3"
   }
 }