@rollup-extras/plugin-serve 1.2.1 → 1.2.2

package/dist/index.cjs

@@ -5,97 +5,21 @@ var https = require('https');
 var Koa = require('koa');
 var koaLogger = require('koa-logger');
 var serveStatic = require('koa-static');
-var logger$1 = require('@niceties/logger');
-
-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 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');
 
 let globalServer;
 const factories = { logger };
-function index (options = {}) {
-    const normalizedOptions = getOptions(options, {
+function index (options$1 = {}) {
+    const normalizedOptions = options.getOptions(options$1, {
         pluginName: '@rollup-extras/plugin-serve',
         useWriteBundle: true,
         port: 8080,
         useKoaLogger: true
     }, 'dirs', factories);
     const { pluginName, useWriteBundle, port, host, https: https$1, useKoaLogger, customizeKoa, koaStaticOptions, onListen, logger } = normalizedOptions;
-    const instance = multiConfigPluginBase(useWriteBundle, pluginName, serve);
+    const instance = mutliConfigPluginBase.multiConfigPluginBase(useWriteBundle, pluginName, serve);
     let { dirs } = normalizedOptions, collectDirs = false, started = false, watchMode = true;
     const pluginInstance = Object.assign(Object.assign({}, instance), { outputOptions });
     if (!dirs) {

package/dist/index.mjs

@@ -3,85 +3,9 @@ import { createServer } from 'https';
 import Koa from 'koa';
 import koaLogger from 'koa-logger';
 import serveStatic from 'koa-static';
-import { createLogger } from '@niceties/logger';
-
-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 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 { getOptions } from '@rollup-extras/utils/options';
+import logger from '@rollup-extras/utils/logger';
+import { multiConfigPluginBase } from '@rollup-extras/utils/mutli-config-plugin-base';
 
 let globalServer;
 const factories = { logger };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.1",
+  "version": "1.2.2",
   "license": "MIT",
   "name": "@rollup-extras/plugin-serve",
   "author": {
@@ -60,7 +60,7 @@
     "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",
     "@types/koa": "^2.13.4",
     "@types/koa-logger": "^3.1.2",
     "@types/koa-static": "^4.0.2"
@@ -73,6 +73,6 @@
     "koa-static": "^5.0.0",
     "koa-logger": "^3.2.1",
     "@niceties/logger": "^1.1.4",
-    "@rollup-extras/utils": "^1.3.1"
+    "@rollup-extras/utils": "^1.3.2"
   }
 }