fix(loader): throw an exception if input is not valid SVG

Closes #170

Author: kisenka

lib/exceptions.js

@@ -1,7 +1,7 @@
 const { PACKAGE_NAME } = require('./config');
 
 class LoaderException extends Error {
-  constructor(message) {
+  constructor(message = '') {
     super(`${PACKAGE_NAME} exception. ${message}`);
 
     this.name = this.constructor.name;
@@ -14,6 +14,12 @@ class LoaderException extends Error {
   }
 }
 
+class InvalidSvg extends LoaderException {
+  constructor(content) {
+    super(`\n\n${content}`);
+  }
+}
+
 class ExtractPluginMissingException extends LoaderException {
   constructor() {
     super(`${PACKAGE_NAME} in extract mode requires the corresponding plugin`);
@@ -35,6 +41,7 @@ class RemainingLoadersInExtractModeException extends LoaderException {
 }
 
 exports.LoaderException = LoaderException;
+exports.InvalidSvg = InvalidSvg;
 exports.ExtractPluginMissingException = ExtractPluginMissingException;
 exports.InvalidRuntimeException = InvalidRuntimeException;
 exports.SeveralRulesAppliedException = SeveralRulesAppliedException;

lib/loader.js

@@ -4,7 +4,7 @@ const SVGCompiler = require('svg-baker');
 
 const { NAMESPACE } = require('./config');
 const configure = require('./configurator');
-const utils = require('./utils');
+const { getMatchedRules, getLoadersRules } = require('./utils');
 const Exceptions = require('./exceptions');
 
 let svgCompiler = new SVGCompiler();
@@ -21,6 +21,16 @@ module.exports = function loader(content) {
   const compiler = loaderContext._compiler;
   const isChildCompiler = compiler.isChild();
   const parentCompiler = isChildCompiler ? compiler.parentCompilation.compiler : null;
+  const issuer = loaderContext._module && loaderContext._module.issuer;
+  const matchedRules = getMatchedRules(resource, getLoadersRules(compiler), issuer);
+
+  if (matchedRules.length > 1 && !compiler.isChild()) {
+    this.emitWarning(new Exceptions.SeveralRulesAppliedException(resource, matchedRules));
+  }
+
+  if (!content.includes('<svg')) {
+    throw new Exceptions.InvalidSvg(content, matchedRules);
+  }
 
   /**
    * @type {SVGSpriteLoaderConfig}
@@ -53,12 +63,6 @@ module.exports = function loader(content) {
     throw new Exceptions.InvalidRuntimeException(e.message);
   }
 
-  const issuer = loaderContext._module && loaderContext._module.issuer;
-  const matchedRules = utils.getMatchedRules(resource, utils.getLoadersRules(compiler), issuer);
-  if (matchedRules.length > 1 && !compiler.isChild()) {
-    this.emitWarning(new Exceptions.SeveralRulesAppliedException(resource, matchedRules));
-  }
-
   const idPattern = config.symbolId + (resourceQuery ? `--${urlSlug(resourceQuery)}` : '');
   const id = interpolateName(loaderContext, idPattern, {
     content,

test/loader.test.js

@@ -39,7 +39,7 @@ describe('loader and plugin', () => {
       });
 
       it('should warn if several rules applied to module without issuer applied', async () => {
-        const { warnings } = await compile({
+        const { warnings } = await compileAndNotReject({
           entry: './entry',
           module: rules(
             svgRule(),
@@ -67,7 +67,7 @@ describe('loader and plugin', () => {
     });
 
     it('should filter rules against issuer', async () => {
-      const { warnings } = await compile({
+      const { warnings } = await compileAndNotReject({
         entry: './entry',
         module: rules(
           svgRule(),