weboptimizer 4.0.63 → 4.0.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.63",
+  "version": "4.0.64",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -102,7 +102,7 @@
     "babel-loader": "^10.1.1",
     "babel-plugin-polyfill-corejs3": "^1.0.0",
     "babel-plugin-transform-rewrite-imports": "^1.5.4",
-    "clientnode": "4.0.1499",
+    "clientnode": "4.0.1500",
     "core-js": "^3.50.0",
     "ejs": "^6.0.1",
     "exports-loader": "^5.0.0",
@@ -165,7 +165,7 @@
     "terser-webpack-plugin": "^5.6.1",
     "typescript-eslint": "^8.68.0",
     "typescript-plugin-css-modules": "^5.2.0",
-    "web-documentation": "^1.0.49",
+    "web-documentation": "^1.0.50",
     "workbox-webpack-plugin": "^7.4.1"
   },
   "peerDependencies": {

package/webpackConfigurator.js

@@ -16,7 +16,7 @@
     endregion
 */
 // region imports
-import { convertToValidVariableName, evaluate, escapeRegularExpressions, extend, importFilesystemAPI, isFileSync, isObject, isPlainObject, Logger, mask, optionalImport, represent, UTILITY_SCOPE } from 'clientnode';
+import { convertToValidVariableName, evaluate, evaluateOrThrowError as evaluateOrThrowErrorBase, escapeRegularExpressions, extend, importFilesystemAPI, isFileSync, isObject, isPlainObject, Logger, mask, optionalImport, represent, UTILITY_SCOPE } from 'clientnode';
 import { rm, writeFile } from 'fs/promises';
 import { extname, join, relative, resolve } from 'path';
 import util from 'util';
@@ -370,34 +370,33 @@ const scope = {
   isFilePathInDependencies,
   loader
 };
-const evaluateOrThrowOnError = (object, givenOptions = {}) => {
+const evaluateOrThrowError = (object, givenOptions = {}) => {
   const options = {
+    async: false,
     filePath: configuration.path.context,
     ...givenOptions
   };
-  if (typeof object === 'string') {
-    const evaluated = evaluate(object, {
-      scope: {
-        filePath: options.filePath,
-        ...scope,
-        type: options.type
-      }
-    });
-    if (evaluated.error) throw new Error('Error occurred during processing given expression: ' + evaluated.error);
-    return evaluated.result;
-  }
+  if (typeof object === 'string') evaluateOrThrowErrorBase(object, {
+    async: options.async,
+    scope: {
+      filePath: options.filePath,
+      ...scope,
+      type: options.type
+    }
+  });
   return object;
 };
-const createEvaluateMapper = type => value => evaluateOrThrowOnError(value, {
+const createEvaluateMapper = (type, async = false) => value => evaluateOrThrowError(value, {
+  async,
   type
 });
 const evaluateAdditionalLoaderConfiguration = loaderConfiguration => ({
-  exclude: filePath => evaluateOrThrowOnError(loaderConfiguration.exclude, {
+  exclude: filePath => evaluateOrThrowError(loaderConfiguration.exclude, {
     filePath
   }),
-  include: loaderConfiguration.include && evaluateOrThrowOnError(loaderConfiguration.include) || configuration.path.source.base,
-  test: new RegExp(evaluateOrThrowOnError(loaderConfiguration.test)),
-  use: evaluateOrThrowOnError(loaderConfiguration.use)
+  include: loaderConfiguration.include && evaluateOrThrowError(loaderConfiguration.include) || configuration.path.source.base,
+  test: new RegExp(evaluateOrThrowError(loaderConfiguration.test)),
+  use: evaluateOrThrowError(loaderConfiguration.use)
 });
 const getIncludingPaths = path => normalizePaths([path].concat(module.locations.directoryPaths));
 const postCSSResolver = (name, _context) => {
@@ -422,7 +421,7 @@ const cssUse = (await Promise.all(module.preprocessor.cascadingStyleSheet.additi
       plugins: [].concat(postcssImport ? postcssImport({
         root: configuration.path.context,
         resolve: postCSSResolver
-      }) : [], await Promise.all(module.preprocessor.cascadingStyleSheet.additional.plugins.pre.map(createEvaluateMapper('css.postcss'))),
+      }) : [], await Promise.all(module.preprocessor.cascadingStyleSheet.additional.plugins.pre.map(createEvaluateMapper('css.postcss', true))),
       /*
           NOTE: Checking path doesn't work if fonts
           are referenced in libraries provided in
@@ -470,7 +469,7 @@ const genericLoader = {
   // Convert to compatible native web types.
   // region generic template
   ejs: {
-    exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || module.preprocessor.ejs.exclude === null ? false : evaluateOrThrowOnError(module.preprocessor.ejs.exclude, {
+    exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || module.preprocessor.ejs.exclude === null ? false : evaluateOrThrowError(module.preprocessor.ejs.exclude, {
       filePath
     }),
     include: getIncludingPaths(configuration.path.source.asset.template),
@@ -487,12 +486,12 @@ const genericLoader = {
   // endregion
   // region script
   script: {
-    exclude: filePath => evaluateOrThrowOnError(module.preprocessor.javaScript.exclude, {
+    exclude: filePath => evaluateOrThrowError(module.preprocessor.javaScript.exclude, {
       filePath,
       type: 'script'
     }),
     include: filePath => {
-      const result = evaluateOrThrowOnError(module.preprocessor.javaScript.include, {
+      const result = evaluateOrThrowError(module.preprocessor.javaScript.include, {
         filePath,
         type: 'script'
       });
@@ -517,7 +516,7 @@ const genericLoader = {
       use: configuration.files.defaultHTML.template.use
     },
     ejs: {
-      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.preprocessor.html.exclude === null ? false : evaluateOrThrowOnError(module.preprocessor.html.exclude, {
+      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.preprocessor.html.exclude === null ? false : evaluateOrThrowError(module.preprocessor.html.exclude, {
         filePath,
         type: 'html.ejs'
       })),
@@ -543,7 +542,7 @@ const genericLoader = {
       }, await Promise.all(module.preprocessor.html.additional.post.map(createEvaluateMapper('html.ejs'))))
     },
     html: {
-      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.html.exclude === null ? true : evaluateOrThrowOnError(module.html.exclude, {
+      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.html.exclude === null ? true : evaluateOrThrowError(module.html.exclude, {
         filePath,
         type: 'html'
       })),
@@ -563,12 +562,12 @@ const genericLoader = {
   // Load dependencies.
   // region style
   style: {
-    exclude: filePath => module.cascadingStyleSheet.exclude === null ? isFilePathInDependencies(filePath) : evaluateOrThrowOnError(module.cascadingStyleSheet.exclude, {
+    exclude: filePath => module.cascadingStyleSheet.exclude === null ? isFilePathInDependencies(filePath) : evaluateOrThrowError(module.cascadingStyleSheet.exclude, {
       filePath,
       type: 'style'
     }),
     include: filePath => {
-      const result = evaluateOrThrowOnError(module.cascadingStyleSheet.include, {
+      const result = evaluateOrThrowError(module.cascadingStyleSheet.include, {
         filePath,
         type: 'style'
       });
@@ -586,7 +585,7 @@ const genericLoader = {
   // region font
   font: {
     eot: {
-      exclude: filePath => module.optimizer.font.eot.exclude === null ? false : evaluateOrThrowOnError(module.optimizer.font.eot.exclude, {
+      exclude: filePath => module.optimizer.font.eot.exclude === null ? false : evaluateOrThrowError(module.optimizer.font.eot.exclude, {
         filePath,
         type: 'font.eot'
       }),
@@ -603,7 +602,7 @@ const genericLoader = {
       use: await Promise.all(module.optimizer.font.eot.loader.map(createEvaluateMapper('font.eot')))
     },
     svg: {
-      exclude: filePath => module.optimizer.font.svg.exclude === null ? false : evaluateOrThrowOnError(module.optimizer.font.svg.exclude, {
+      exclude: filePath => module.optimizer.font.svg.exclude === null ? false : evaluateOrThrowError(module.optimizer.font.svg.exclude, {
         filePath,
         type: 'svg'
       }),
@@ -622,7 +621,7 @@ const genericLoader = {
       use: await Promise.all(module.optimizer.font.svg.loader.map(createEvaluateMapper('font.svg')))
     },
     ttf: {
-      exclude: filePath => module.optimizer.font.ttf.exclude === null ? false : evaluateOrThrowOnError(module.optimizer.font.ttf.exclude, {
+      exclude: filePath => module.optimizer.font.ttf.exclude === null ? false : evaluateOrThrowError(module.optimizer.font.ttf.exclude, {
         filePath,
         type: 'ttf'
       }),
@@ -640,7 +639,7 @@ const genericLoader = {
       use: await Promise.all(module.optimizer.font.ttf.loader.map(createEvaluateMapper('font.ttf')))
     },
     woff: {
-      exclude: filePath => module.optimizer.font.woff.exclude === null ? false : evaluateOrThrowOnError(module.optimizer.font.woff.exclude, {
+      exclude: filePath => module.optimizer.font.woff.exclude === null ? false : evaluateOrThrowError(module.optimizer.font.woff.exclude, {
         filePath,
         type: 'woff'
       }),
@@ -660,7 +659,7 @@ const genericLoader = {
   // endregion
   // region image
   image: {
-    exclude: filePath => module.optimizer.image.exclude === null ? isFilePathInDependencies(filePath) : evaluateOrThrowOnError(module.optimizer.image.exclude, {
+    exclude: filePath => module.optimizer.image.exclude === null ? isFilePathInDependencies(filePath) : evaluateOrThrowError(module.optimizer.image.exclude, {
       filePath,
       type: 'image'
     }),
@@ -682,7 +681,7 @@ const genericLoader = {
   data: {
     exclude: filePath => {
       if (typeof filePath !== 'string') return false;
-      return configuration.extensions.file.internal.includes(extname(stripLoader(filePath))) || (module.optimizer.data.exclude === null ? isFilePathInDependencies(filePath) : evaluateOrThrowOnError(module.optimizer.data.exclude, {
+      return configuration.extensions.file.internal.includes(extname(stripLoader(filePath))) || (module.optimizer.data.exclude === null ? isFilePathInDependencies(filePath) : evaluateOrThrowError(module.optimizer.data.exclude, {
         filePath,
         type: 'data'
       }));