@jsenv/test 3.6.6 → 3.6.7

package/dist/jsenv_test.js

@@ -2491,9 +2491,19 @@ const applyPatternMatching = ({ url, pattern }) => {
   return applyPattern({ url, pattern });
 };
 
-const resolveAssociations = (associations, baseUrl) => {
-  if (baseUrl && typeof baseUrl.href === "string") baseUrl = baseUrl.href;
-  assertUrlLike(baseUrl, "baseUrl");
+const resolveAssociations = (associations, resolver) => {
+  let resolve = () => {};
+  if (typeof resolver === "function") {
+    resolve = resolver;
+  } else if (typeof resolver === "string") {
+    const baseUrl = resolver;
+    assertUrlLike(baseUrl, "baseUrl");
+    resolve = (pattern) => new URL(pattern, baseUrl).href;
+  } else if (resolver && typeof resolver.href === "string") {
+    const baseUrl = resolver.href;
+    assertUrlLike(baseUrl, "baseUrl");
+    resolve = (pattern) => new URL(pattern, baseUrl).href;
+  }
 
   const associationsResolved = {};
   for (const key of Object.keys(associations)) {
@@ -2504,12 +2514,11 @@ const resolveAssociations = (associations, baseUrl) => {
         const valueAssociated = value[pattern];
         let patternResolved;
         try {
-          patternResolved = String(new URL(pattern, baseUrl));
+          patternResolved = resolve(pattern);
         } catch {
           // it's not really an url, no need to perform url resolution nor encoding
           patternResolved = pattern;
         }
-
         valueMapResolved[patternResolved] = valueAssociated;
       }
       associationsResolved[key] = valueMapResolved;
@@ -2632,34 +2641,29 @@ const urlChildMayMatch = ({ url, associations, predicate }) => {
 };
 
 const applyAliases = ({ url, aliases }) => {
-  let aliasFullMatchResult;
-  const aliasMatchingKey = Object.keys(aliases).find((key) => {
-    const aliasMatchResult = applyPatternMatching({
+  for (const key of Object.keys(aliases)) {
+    const matchResult = applyPatternMatching({
       pattern: key,
       url,
     });
-    if (aliasMatchResult.matched) {
-      aliasFullMatchResult = aliasMatchResult;
-      return true;
+    if (!matchResult.matched) {
+      continue;
     }
-    return false;
-  });
-  if (!aliasMatchingKey) {
-    return url;
-  }
-  const { matchGroups } = aliasFullMatchResult;
-  const alias = aliases[aliasMatchingKey];
-  const parts = alias.split("*");
-  let newUrl = "";
-  let index = 0;
-  for (const part of parts) {
-    newUrl += `${part}`;
-    if (index < parts.length - 1) {
-      newUrl += matchGroups[index];
+    const { matchGroups } = matchResult;
+    const alias = aliases[key];
+    const parts = alias.split("*");
+    let newUrl = "";
+    let index = 0;
+    for (const part of parts) {
+      newUrl += `${part}`;
+      if (index < parts.length - 1) {
+        newUrl += matchGroups[index];
+      }
+      index++;
     }
-    index++;
+    return newUrl;
   }
-  return newUrl;
+  return url;
 };
 
 const matches = (url, patterns) => {

package/dist/v8_coverage/v8_coverage.js

@@ -336,9 +336,19 @@ const applyPatternMatching = ({ url, pattern }) => {
   return applyPattern({ url, pattern });
 };
 
-const resolveAssociations = (associations, baseUrl) => {
-  if (baseUrl && typeof baseUrl.href === "string") baseUrl = baseUrl.href;
-  assertUrlLike(baseUrl, "baseUrl");
+const resolveAssociations = (associations, resolver) => {
+  let resolve = () => {};
+  if (typeof resolver === "function") {
+    resolve = resolver;
+  } else if (typeof resolver === "string") {
+    const baseUrl = resolver;
+    assertUrlLike(baseUrl, "baseUrl");
+    resolve = (pattern) => new URL(pattern, baseUrl).href;
+  } else if (resolver && typeof resolver.href === "string") {
+    const baseUrl = resolver.href;
+    assertUrlLike(baseUrl, "baseUrl");
+    resolve = (pattern) => new URL(pattern, baseUrl).href;
+  }
 
   const associationsResolved = {};
   for (const key of Object.keys(associations)) {
@@ -349,12 +359,11 @@ const resolveAssociations = (associations, baseUrl) => {
         const valueAssociated = value[pattern];
         let patternResolved;
         try {
-          patternResolved = String(new URL(pattern, baseUrl));
+          patternResolved = resolve(pattern);
         } catch {
           // it's not really an url, no need to perform url resolution nor encoding
           patternResolved = pattern;
         }
-
         valueMapResolved[patternResolved] = valueAssociated;
       }
       associationsResolved[key] = valueMapResolved;
@@ -477,34 +486,29 @@ const urlChildMayMatch = ({ url, associations, predicate }) => {
 };
 
 const applyAliases = ({ url, aliases }) => {
-  let aliasFullMatchResult;
-  const aliasMatchingKey = Object.keys(aliases).find((key) => {
-    const aliasMatchResult = applyPatternMatching({
+  for (const key of Object.keys(aliases)) {
+    const matchResult = applyPatternMatching({
       pattern: key,
       url,
     });
-    if (aliasMatchResult.matched) {
-      aliasFullMatchResult = aliasMatchResult;
-      return true;
+    if (!matchResult.matched) {
+      continue;
     }
-    return false;
-  });
-  if (!aliasMatchingKey) {
-    return url;
-  }
-  const { matchGroups } = aliasFullMatchResult;
-  const alias = aliases[aliasMatchingKey];
-  const parts = alias.split("*");
-  let newUrl = "";
-  let index = 0;
-  for (const part of parts) {
-    newUrl += `${part}`;
-    if (index < parts.length - 1) {
-      newUrl += matchGroups[index];
+    const { matchGroups } = matchResult;
+    const alias = aliases[key];
+    const parts = alias.split("*");
+    let newUrl = "";
+    let index = 0;
+    for (const part of parts) {
+      newUrl += `${part}`;
+      if (index < parts.length - 1) {
+        newUrl += matchGroups[index];
+      }
+      index++;
     }
-    index++;
+    return newUrl;
   }
-  return newUrl;
+  return url;
 };
 
 const matches = (url, patterns) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/test",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -42,14 +42,14 @@
     "@c88/v8-coverage": "0.1.1",
     "@jsenv/abort": "4.3.1",
     "@jsenv/ast": "6.6.6",
-    "@jsenv/exception": "1.1.6",
-    "@jsenv/filesystem": "4.14.4",
-    "@jsenv/github-check-run": "0.2.19",
+    "@jsenv/exception": "1.1.7",
+    "@jsenv/filesystem": "4.14.5",
+    "@jsenv/github-check-run": "0.2.20",
     "@jsenv/node-esm-resolution": "1.1.0",
     "@jsenv/humanize": "1.3.1",
     "@jsenv/plugin-supervisor": "1.6.11",
     "@jsenv/sourcemap": "1.3.3",
-    "@jsenv/url-meta": "8.5.5",
+    "@jsenv/url-meta": "8.5.6",
     "@jsenv/urls": "2.7.0",
     "@jsenv/utils": "2.2.1",
     "he": "1.2.0",