refactor: code (#343)

Author: cap-Bernardito

.gitignore

@@ -20,3 +20,5 @@ Thumbs.db
 .vscode
 *.sublime-project
 *.sublime-workspace
+/test/fixtures/generated-1.html
+/test/fixtures/generated-2.html

src/index.js

@@ -5,7 +5,6 @@ import {
   getImportCode,
   getModuleCode,
   getExportCode,
-  stringifyRequest,
 } from './utils';
 
 import schema from './options.json';
@@ -27,10 +26,9 @@ export default async function loader(content) {
   if (options.attributes) {
     plugins.push(
       sourcePlugin({
-        urlHandler: (url) =>
-          url[0] === '/' ? `"${url}"` : stringifyRequest(this, url),
         attributes: options.attributes,
         resourcePath: this.resourcePath,
+        context: this.context,
         imports,
         errors,
         replacements,

src/plugins/source-plugin.js

@@ -9,14 +9,16 @@ import {
   requestify,
   isUrlRequestable,
   c0ControlCodesExclude,
-  isUrlRequest,
+  stringifyRequest,
 } from '../utils';
 
 export default (options) =>
   function process(html) {
     const { list, urlFilter: maybeUrlFilter } = options.attributes;
     const sources = [];
-    const urlFilter = getFilter(maybeUrlFilter, (value) => isUrlRequest(value));
+    const urlFilter = getFilter(maybeUrlFilter, (value) =>
+      isUrlRequestable(value)
+    );
     const getAttribute = (tag, attribute, attributes, resourcePath) =>
       list.find((element) => {
         const foundTag =
@@ -220,7 +222,7 @@ export default (options) =>
 
         options.imports.push({
           importName,
-          source: options.urlHandler(newUrl),
+          source: stringifyRequest(options.context, newUrl),
         });
       }
 

src/utils.js

@@ -377,35 +377,29 @@ export function normalizeUrl(url) {
 const moduleRequestRegex = /^[^?]*~/;
 const matchNativeWin32Path = /^[A-Z]:[/\\]|^\\\\/i;
 
-function urlToRequest(url) {
-  if (url === '') {
-    return '';
+export function requestify(url) {
+  if (matchNativeWin32Path.test(url) || url[0] === '/') {
+    return url;
   }
 
-  let request = url;
+  if (/^file:/i.test(url)) {
+    return url;
+  }
 
-  if (matchNativeWin32Path.test(url) || url[0] === '/') {
-    request = url;
-  } else if (/^\.\.?\//.test(url)) {
-    request = url;
-  } else {
-    // every other url is threaded like a relative url
-    request = `./${url}`;
+  if (/^\.\.?\//.test(url)) {
+    return url;
   }
 
   // A `~` makes the url an module
-  if (moduleRequestRegex.test(request)) {
-    request = request.replace(moduleRequestRegex, '');
+  if (moduleRequestRegex.test(url)) {
+    return url.replace(moduleRequestRegex, '');
   }
 
-  return request;
-}
-
-export function requestify(url) {
-  return urlToRequest(url);
+  // every other url is threaded like a relative url
+  return `./${url}`;
 }
 
-export function isUrlRequest(url) {
+export function isUrlRequestable(url) {
   // Protocol-relative URLs
   if (/^\/\//.test(url)) {
     return false;
@@ -429,25 +423,18 @@ export function isUrlRequest(url) {
   return true;
 }
 
-export function isUrlRequestable(url) {
-  return isUrlRequest(url);
-}
-
 const matchRelativePath = /^\.\.?[/\\]/;
 
 function isAbsolutePath(str) {
-  return path.posix.isAbsolute(str) || path.win32.isAbsolute(str);
+  return matchNativeWin32Path.test(str) && path.win32.isAbsolute(str);
 }
 
 function isRelativePath(str) {
   return matchRelativePath.test(str);
 }
 
-export function stringifyRequest(loaderContext, request) {
+export function stringifyRequest(context, request) {
   const splitted = request.split('!');
-  const context =
-    loaderContext.context ||
-    (loaderContext.options && loaderContext.options.context);
 
   return JSON.stringify(
     splitted
@@ -836,10 +823,9 @@ export function getImportCode(html, loaderContext, imports, options) {
     return '';
   }
 
-  const stringifiedHelperRequest = stringifyRequest(
-    loaderContext,
-    require.resolve('./runtime/getUrl.js')
-  );
+  const stringifiedHelperRequest = `"${path
+    .relative(loaderContext.context, require.resolve('./runtime/getUrl.js'))
+    .replace(/\\/g, '/')}"`;
 
   let code = options.esModule
     ? `import ${GET_SOURCE_FROM_IMPORT_NAME} from ${stringifiedHelperRequest};\n`

test/__snapshots__/attributes-option.test.js.snap

@@ -0,0 +1,3 @@
+import html from './generated-1.html';
+
+export default html;

test/__snapshots__/esModule-option.test.js.snap

@@ -0,0 +1,3 @@
+import html from './generated-2.html';
+
+export default html;