update tests and fix final ts errors

Author: TheLarkInn

lib/interpolateName.ts

@@ -2,11 +2,17 @@ import type { LoaderContext } from "webpack";
 import path from "path";
 import getHashDigest from './getHashDigest';
 
-export default function interpolateName(loaderContext: LoaderContext<{}>, name: string, options = {}) {
+interface IInterpolateNameOptions {
+  content?: Buffer;
+  context?: string;
+  regExp?: string;
+}
+
+export default function interpolateName(loaderContext: LoaderContext<{}>, name: string | ((resourcePath: string, resourceQuery?: string) => string), options: IInterpolateNameOptions = {}) {
   let filename;
 
-  const hasQuery =
-    loaderContext.resourceQuery && loaderContext.resourceQuery.length > 1;
+  const hasQuery: boolean =
+    (loaderContext.resourceQuery && loaderContext.resourceQuery.length > 1) as boolean;
 
   if (typeof name === "function") {
     filename = name(
@@ -98,9 +104,12 @@ export default function interpolateName(loaderContext: LoaderContext<{}>, name:
   }
 
   if (
+    // @ts-ignore
     typeof loaderContext.options === "object" &&
+    // @ts-ignore
     typeof loaderContext.options.customInterpolateName === "function"
   ) {
+    // @ts-ignore
     url = loaderContext.options.customInterpolateName.call(
       loaderContext,
       url,
@@ -110,4 +119,4 @@ export default function interpolateName(loaderContext: LoaderContext<{}>, name:
   }
 
   return url;
-}
+}

lib/urlToRequest.ts

@@ -20,7 +20,7 @@ export default function urlToRequest(url: string, root?: string | boolean): stri
       // 1. root is a string: root is prefixed to the url
       case "string":
         // special case: `~` roots convert to module request
-        if (MODULE_REQUEST_REGEX.test(root)) {
+        if (MODULE_REQUEST_REGEXP.test(root)) {
           request = root.replace(/([^~/])$/, "$1/") + url.slice(1);
         } else {
           request = root + url;
@@ -49,8 +49,8 @@ export default function urlToRequest(url: string, root?: string | boolean): stri
   }
 
   // A `~` makes the url an module
-  if (MODULE_REQUEST_REGEX.test(request)) {
-    request = request.replace(MODULE_REQUEST_REGEX, "");
+  if (MODULE_REQUEST_REGEXP.test(request)) {
+    request = request.replace(MODULE_REQUEST_REGEXP, "");
   }
 
   return request;

test/getHashDigest.test.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const loaderUtils = require("../");
+const loaderUtils = require("../dist");
 
 describe("getHashDigest()", () => {
   [

test/interpolateName.test.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const loaderUtils = require("../");
+const loaderUtils = require("../dist");
 
 describe("interpolateName()", () => {
   function run(tests) {

test/isUrlRequest.test.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const loaderUtils = require("../");
+const loaderUtils = require("../dist");
 
 function ExpectedError(regex) {
   this.regex = regex;

test/urlToRequest.test.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const loaderUtils = require("../");
+const loaderUtils = require("../dist");
 
 function ExpectedError(regex) {
   this.regex = regex;