@jsenv/core 40.12.0 → 40.12.2

package/dist/build/build.js

@@ -5824,7 +5824,7 @@ const jsenvPluginInlineContentFetcher = () => {
        * BUT the last reference is the "http_request"
        * so it's more likely the before last reference that contains the latest version
        *
-       * BUT the is an exception when using supervisor as the before last reference
+       * BUT there is an exception when using supervisor as the before last reference
        * is the one fetched by the browser that is already cooked
        * we must re-cook from the original content, not from the already cooked content
        * Otherwise references are already resolved and

package/dist/build/jsenv_core_packages.js

@@ -852,19 +852,47 @@ const setDecimalsPrecision = (
 //   return numberTruncated
 // }
 
-const unitShort = {
-  year: "y",
-  month: "m",
-  week: "w",
-  day: "d",
-  hour: "h",
-  minute: "m",
-  second: "s",
+const UNIT_MS = {
+  year: 31_557_600_000,
+  month: 2_629_000_000,
+  week: 604_800_000,
+  day: 86_400_000,
+  hour: 3_600_000,
+  minute: 60_000,
+  second: 1000,
+};
+const UNIT_KEYS = Object.keys(UNIT_MS);
+const SMALLEST_UNIT_NAME = UNIT_KEYS[UNIT_KEYS.length - 1];
+const TIME_DICTIONARY_EN = {
+  year: { long: "year", plural: "years", short: "y" },
+  month: { long: "month", plural: "months", short: "m" },
+  week: { long: "week", plural: "weeks", short: "w" },
+  day: { long: "day", plural: "days", short: "d" },
+  hour: { long: "hour", plural: "hours", short: "h" },
+  minute: { long: "minute", plural: "minutes", short: "m" },
+  second: { long: "second", plural: "seconds", short: "s" },
+  joinDuration: (primary, remaining) => `${primary} and ${remaining}`,
+};
+const TIME_DICTIONARY_FR = {
+  year: { long: "an", plural: "ans", short: "a" },
+  month: { long: "mois", plural: "mois", short: "m" },
+  week: { long: "semaine", plural: "semaines", short: "s" },
+  day: { long: "jour", plural: "jours", short: "j" },
+  hour: { long: "heure", plural: "heures", short: "h" },
+  minute: { long: "minute", plural: "minutes", short: "m" },
+  second: { long: "seconde", plural: "secondes", short: "s" },
+  joinDuration: (primary, remaining) => `${primary} et ${remaining}`,
 };
 
 const humanizeDuration = (
   ms,
-  { short, rounded = true, decimals } = {},
+  {
+    short,
+    rounded = true,
+    decimals,
+    lang = "en",
+    timeDictionnary = lang === "fr" ? TIME_DICTIONARY_FR : TIME_DICTIONARY_EN,
+  } = {},
 ) => {
   // ignore ms below meaningfulMs so that:
   // humanizeDuration(0.5) -> "0 second"
@@ -874,7 +902,9 @@ const humanizeDuration = (
   // yes we could return "0.1 millisecond" but we choosed consistency over precision
   // so that the prefered unit is "second" (and does not become millisecond when ms is super small)
   if (ms < 1) {
-    return short ? "0s" : "0 second";
+    return short
+      ? `0${timeDictionnary.second.short}`
+      : `0 ${timeDictionnary.second.long}`;
   }
   const { primary, remaining } = parseMs(ms);
   if (!remaining) {
@@ -883,52 +913,51 @@ const humanizeDuration = (
         decimals === undefined ? (primary.name === "second" ? 1 : 0) : decimals,
       short,
       rounded,
+      timeDictionnary,
     });
   }
-  return `${humanizeDurationUnit(primary, {
+  const primaryText = humanizeDurationUnit(primary, {
     decimals: decimals === undefined ? 0 : decimals,
     short,
     rounded,
-  })} and ${humanizeDurationUnit(remaining, {
+    timeDictionnary,
+  });
+  const remainingText = humanizeDurationUnit(remaining, {
     decimals: decimals === undefined ? 0 : decimals,
     short,
     rounded,
-  })}`;
+    timeDictionnary,
+  });
+  return timeDictionnary.joinDuration(primaryText, remainingText);
 };
-const humanizeDurationUnit = (unit, { decimals, short, rounded }) => {
+const humanizeDurationUnit = (
+  unit,
+  { decimals, short, rounded, timeDictionnary },
+) => {
   const count = rounded
     ? setRoundedPrecision(unit.count, { decimals })
     : setPrecision(unit.count, { decimals });
-  let name = unit.name;
+  const name = unit.name;
   if (short) {
-    name = unitShort[name];
-    return `${count}${name}`;
+    const unitText = timeDictionnary[name].short;
+    return `${count}${unitText}`;
   }
   if (count <= 1) {
-    return `${count} ${name}`;
+    const unitText = timeDictionnary[name].long;
+    return `${count} ${unitText}`;
   }
-  return `${count} ${name}s`;
-};
-const MS_PER_UNITS = {
-  year: 31_557_600_000,
-  month: 2_629_000_000,
-  week: 604_800_000,
-  day: 86_400_000,
-  hour: 3_600_000,
-  minute: 60_000,
-  second: 1000,
+  const unitText = timeDictionnary[name].plural;
+  return `${count} ${unitText}`;
 };
 
 const parseMs = (ms) => {
-  const unitNames = Object.keys(MS_PER_UNITS);
-  const smallestUnitName = unitNames[unitNames.length - 1];
-  let firstUnitName = smallestUnitName;
-  let firstUnitCount = ms / MS_PER_UNITS[smallestUnitName];
-  const firstUnitIndex = unitNames.findIndex((unitName) => {
-    if (unitName === smallestUnitName) {
+  let firstUnitName = SMALLEST_UNIT_NAME;
+  let firstUnitCount = ms / UNIT_MS[SMALLEST_UNIT_NAME];
+  const firstUnitIndex = UNIT_KEYS.findIndex((unitName) => {
+    if (unitName === SMALLEST_UNIT_NAME) {
       return false;
     }
-    const msPerUnit = MS_PER_UNITS[unitName];
+    const msPerUnit = UNIT_MS[unitName];
     const unitCount = Math.floor(ms / msPerUnit);
     if (unitCount) {
       firstUnitName = unitName;
@@ -937,7 +966,7 @@ const parseMs = (ms) => {
     }
     return false;
   });
-  if (firstUnitName === smallestUnitName) {
+  if (firstUnitName === SMALLEST_UNIT_NAME) {
     return {
       primary: {
         name: firstUnitName,
@@ -945,9 +974,9 @@ const parseMs = (ms) => {
       },
     };
   }
-  const remainingMs = ms - firstUnitCount * MS_PER_UNITS[firstUnitName];
-  const remainingUnitName = unitNames[firstUnitIndex + 1];
-  const remainingUnitCount = remainingMs / MS_PER_UNITS[remainingUnitName];
+  const remainingMs = ms - firstUnitCount * UNIT_MS[firstUnitName];
+  const remainingUnitName = UNIT_KEYS[firstUnitIndex + 1];
+  const remainingUnitCount = remainingMs / UNIT_MS[remainingUnitName];
   // - 1 year and 1 second is too much information
   //   so we don't check the remaining units
   // - 1 year and 0.0001 week is awful

package/dist/start_build_server/jsenv_core_packages.js

@@ -760,19 +760,47 @@ const setDecimalsPrecision = (
 //   return numberTruncated
 // }
 
-const unitShort = {
-  year: "y",
-  month: "m",
-  week: "w",
-  day: "d",
-  hour: "h",
-  minute: "m",
-  second: "s",
+const UNIT_MS = {
+  year: 31_557_600_000,
+  month: 2_629_000_000,
+  week: 604_800_000,
+  day: 86_400_000,
+  hour: 3_600_000,
+  minute: 60_000,
+  second: 1000,
+};
+const UNIT_KEYS = Object.keys(UNIT_MS);
+const SMALLEST_UNIT_NAME = UNIT_KEYS[UNIT_KEYS.length - 1];
+const TIME_DICTIONARY_EN = {
+  year: { long: "year", plural: "years", short: "y" },
+  month: { long: "month", plural: "months", short: "m" },
+  week: { long: "week", plural: "weeks", short: "w" },
+  day: { long: "day", plural: "days", short: "d" },
+  hour: { long: "hour", plural: "hours", short: "h" },
+  minute: { long: "minute", plural: "minutes", short: "m" },
+  second: { long: "second", plural: "seconds", short: "s" },
+  joinDuration: (primary, remaining) => `${primary} and ${remaining}`,
+};
+const TIME_DICTIONARY_FR = {
+  year: { long: "an", plural: "ans", short: "a" },
+  month: { long: "mois", plural: "mois", short: "m" },
+  week: { long: "semaine", plural: "semaines", short: "s" },
+  day: { long: "jour", plural: "jours", short: "j" },
+  hour: { long: "heure", plural: "heures", short: "h" },
+  minute: { long: "minute", plural: "minutes", short: "m" },
+  second: { long: "seconde", plural: "secondes", short: "s" },
+  joinDuration: (primary, remaining) => `${primary} et ${remaining}`,
 };
 
 const humanizeDuration = (
   ms,
-  { short, rounded = true, decimals } = {},
+  {
+    short,
+    rounded = true,
+    decimals,
+    lang = "en",
+    timeDictionnary = lang === "fr" ? TIME_DICTIONARY_FR : TIME_DICTIONARY_EN,
+  } = {},
 ) => {
   // ignore ms below meaningfulMs so that:
   // humanizeDuration(0.5) -> "0 second"
@@ -782,7 +810,9 @@ const humanizeDuration = (
   // yes we could return "0.1 millisecond" but we choosed consistency over precision
   // so that the prefered unit is "second" (and does not become millisecond when ms is super small)
   if (ms < 1) {
-    return short ? "0s" : "0 second";
+    return short
+      ? `0${timeDictionnary.second.short}`
+      : `0 ${timeDictionnary.second.long}`;
   }
   const { primary, remaining } = parseMs(ms);
   if (!remaining) {
@@ -791,52 +821,51 @@ const humanizeDuration = (
         decimals === undefined ? (primary.name === "second" ? 1 : 0) : decimals,
       short,
       rounded,
+      timeDictionnary,
     });
   }
-  return `${humanizeDurationUnit(primary, {
+  const primaryText = humanizeDurationUnit(primary, {
     decimals: decimals === undefined ? 0 : decimals,
     short,
     rounded,
-  })} and ${humanizeDurationUnit(remaining, {
+    timeDictionnary,
+  });
+  const remainingText = humanizeDurationUnit(remaining, {
     decimals: decimals === undefined ? 0 : decimals,
     short,
     rounded,
-  })}`;
+    timeDictionnary,
+  });
+  return timeDictionnary.joinDuration(primaryText, remainingText);
 };
-const humanizeDurationUnit = (unit, { decimals, short, rounded }) => {
+const humanizeDurationUnit = (
+  unit,
+  { decimals, short, rounded, timeDictionnary },
+) => {
   const count = rounded
     ? setRoundedPrecision(unit.count, { decimals })
     : setPrecision(unit.count, { decimals });
-  let name = unit.name;
+  const name = unit.name;
   if (short) {
-    name = unitShort[name];
-    return `${count}${name}`;
+    const unitText = timeDictionnary[name].short;
+    return `${count}${unitText}`;
   }
   if (count <= 1) {
-    return `${count} ${name}`;
+    const unitText = timeDictionnary[name].long;
+    return `${count} ${unitText}`;
   }
-  return `${count} ${name}s`;
-};
-const MS_PER_UNITS = {
-  year: 31_557_600_000,
-  month: 2_629_000_000,
-  week: 604_800_000,
-  day: 86_400_000,
-  hour: 3_600_000,
-  minute: 60_000,
-  second: 1000,
+  const unitText = timeDictionnary[name].plural;
+  return `${count} ${unitText}`;
 };
 
 const parseMs = (ms) => {
-  const unitNames = Object.keys(MS_PER_UNITS);
-  const smallestUnitName = unitNames[unitNames.length - 1];
-  let firstUnitName = smallestUnitName;
-  let firstUnitCount = ms / MS_PER_UNITS[smallestUnitName];
-  const firstUnitIndex = unitNames.findIndex((unitName) => {
-    if (unitName === smallestUnitName) {
+  let firstUnitName = SMALLEST_UNIT_NAME;
+  let firstUnitCount = ms / UNIT_MS[SMALLEST_UNIT_NAME];
+  const firstUnitIndex = UNIT_KEYS.findIndex((unitName) => {
+    if (unitName === SMALLEST_UNIT_NAME) {
       return false;
     }
-    const msPerUnit = MS_PER_UNITS[unitName];
+    const msPerUnit = UNIT_MS[unitName];
     const unitCount = Math.floor(ms / msPerUnit);
     if (unitCount) {
       firstUnitName = unitName;
@@ -845,7 +874,7 @@ const parseMs = (ms) => {
     }
     return false;
   });
-  if (firstUnitName === smallestUnitName) {
+  if (firstUnitName === SMALLEST_UNIT_NAME) {
     return {
       primary: {
         name: firstUnitName,
@@ -853,9 +882,9 @@ const parseMs = (ms) => {
       },
     };
   }
-  const remainingMs = ms - firstUnitCount * MS_PER_UNITS[firstUnitName];
-  const remainingUnitName = unitNames[firstUnitIndex + 1];
-  const remainingUnitCount = remainingMs / MS_PER_UNITS[remainingUnitName];
+  const remainingMs = ms - firstUnitCount * UNIT_MS[firstUnitName];
+  const remainingUnitName = UNIT_KEYS[firstUnitIndex + 1];
+  const remainingUnitCount = remainingMs / UNIT_MS[remainingUnitName];
   // - 1 year and 1 second is too much information
   //   so we don't check the remaining units
   // - 1 year and 0.0001 week is awful

package/dist/start_dev_server/jsenv_core_packages.js

@@ -360,19 +360,47 @@ const setDecimalsPrecision = (
 //   return numberTruncated
 // }
 
-const unitShort = {
-  year: "y",
-  month: "m",
-  week: "w",
-  day: "d",
-  hour: "h",
-  minute: "m",
-  second: "s",
+const UNIT_MS = {
+  year: 31_557_600_000,
+  month: 2_629_000_000,
+  week: 604_800_000,
+  day: 86_400_000,
+  hour: 3_600_000,
+  minute: 60_000,
+  second: 1000,
+};
+const UNIT_KEYS = Object.keys(UNIT_MS);
+const SMALLEST_UNIT_NAME = UNIT_KEYS[UNIT_KEYS.length - 1];
+const TIME_DICTIONARY_EN = {
+  year: { long: "year", plural: "years", short: "y" },
+  month: { long: "month", plural: "months", short: "m" },
+  week: { long: "week", plural: "weeks", short: "w" },
+  day: { long: "day", plural: "days", short: "d" },
+  hour: { long: "hour", plural: "hours", short: "h" },
+  minute: { long: "minute", plural: "minutes", short: "m" },
+  second: { long: "second", plural: "seconds", short: "s" },
+  joinDuration: (primary, remaining) => `${primary} and ${remaining}`,
+};
+const TIME_DICTIONARY_FR = {
+  year: { long: "an", plural: "ans", short: "a" },
+  month: { long: "mois", plural: "mois", short: "m" },
+  week: { long: "semaine", plural: "semaines", short: "s" },
+  day: { long: "jour", plural: "jours", short: "j" },
+  hour: { long: "heure", plural: "heures", short: "h" },
+  minute: { long: "minute", plural: "minutes", short: "m" },
+  second: { long: "seconde", plural: "secondes", short: "s" },
+  joinDuration: (primary, remaining) => `${primary} et ${remaining}`,
 };
 
 const humanizeDuration = (
   ms,
-  { short, rounded = true, decimals } = {},
+  {
+    short,
+    rounded = true,
+    decimals,
+    lang = "en",
+    timeDictionnary = lang === "fr" ? TIME_DICTIONARY_FR : TIME_DICTIONARY_EN,
+  } = {},
 ) => {
   // ignore ms below meaningfulMs so that:
   // humanizeDuration(0.5) -> "0 second"
@@ -382,7 +410,9 @@ const humanizeDuration = (
   // yes we could return "0.1 millisecond" but we choosed consistency over precision
   // so that the prefered unit is "second" (and does not become millisecond when ms is super small)
   if (ms < 1) {
-    return short ? "0s" : "0 second";
+    return short
+      ? `0${timeDictionnary.second.short}`
+      : `0 ${timeDictionnary.second.long}`;
   }
   const { primary, remaining } = parseMs(ms);
   if (!remaining) {
@@ -391,52 +421,51 @@ const humanizeDuration = (
         decimals === undefined ? (primary.name === "second" ? 1 : 0) : decimals,
       short,
       rounded,
+      timeDictionnary,
     });
   }
-  return `${humanizeDurationUnit(primary, {
+  const primaryText = humanizeDurationUnit(primary, {
     decimals: decimals === undefined ? 0 : decimals,
     short,
     rounded,
-  })} and ${humanizeDurationUnit(remaining, {
+    timeDictionnary,
+  });
+  const remainingText = humanizeDurationUnit(remaining, {
     decimals: decimals === undefined ? 0 : decimals,
     short,
     rounded,
-  })}`;
+    timeDictionnary,
+  });
+  return timeDictionnary.joinDuration(primaryText, remainingText);
 };
-const humanizeDurationUnit = (unit, { decimals, short, rounded }) => {
+const humanizeDurationUnit = (
+  unit,
+  { decimals, short, rounded, timeDictionnary },
+) => {
   const count = rounded
     ? setRoundedPrecision(unit.count, { decimals })
     : setPrecision(unit.count, { decimals });
-  let name = unit.name;
+  const name = unit.name;
   if (short) {
-    name = unitShort[name];
-    return `${count}${name}`;
+    const unitText = timeDictionnary[name].short;
+    return `${count}${unitText}`;
   }
   if (count <= 1) {
-    return `${count} ${name}`;
+    const unitText = timeDictionnary[name].long;
+    return `${count} ${unitText}`;
   }
-  return `${count} ${name}s`;
-};
-const MS_PER_UNITS = {
-  year: 31_557_600_000,
-  month: 2_629_000_000,
-  week: 604_800_000,
-  day: 86_400_000,
-  hour: 3_600_000,
-  minute: 60_000,
-  second: 1000,
+  const unitText = timeDictionnary[name].plural;
+  return `${count} ${unitText}`;
 };
 
 const parseMs = (ms) => {
-  const unitNames = Object.keys(MS_PER_UNITS);
-  const smallestUnitName = unitNames[unitNames.length - 1];
-  let firstUnitName = smallestUnitName;
-  let firstUnitCount = ms / MS_PER_UNITS[smallestUnitName];
-  const firstUnitIndex = unitNames.findIndex((unitName) => {
-    if (unitName === smallestUnitName) {
+  let firstUnitName = SMALLEST_UNIT_NAME;
+  let firstUnitCount = ms / UNIT_MS[SMALLEST_UNIT_NAME];
+  const firstUnitIndex = UNIT_KEYS.findIndex((unitName) => {
+    if (unitName === SMALLEST_UNIT_NAME) {
       return false;
     }
-    const msPerUnit = MS_PER_UNITS[unitName];
+    const msPerUnit = UNIT_MS[unitName];
     const unitCount = Math.floor(ms / msPerUnit);
     if (unitCount) {
       firstUnitName = unitName;
@@ -445,7 +474,7 @@ const parseMs = (ms) => {
     }
     return false;
   });
-  if (firstUnitName === smallestUnitName) {
+  if (firstUnitName === SMALLEST_UNIT_NAME) {
     return {
       primary: {
         name: firstUnitName,
@@ -453,9 +482,9 @@ const parseMs = (ms) => {
       },
     };
   }
-  const remainingMs = ms - firstUnitCount * MS_PER_UNITS[firstUnitName];
-  const remainingUnitName = unitNames[firstUnitIndex + 1];
-  const remainingUnitCount = remainingMs / MS_PER_UNITS[remainingUnitName];
+  const remainingMs = ms - firstUnitCount * UNIT_MS[firstUnitName];
+  const remainingUnitName = UNIT_KEYS[firstUnitIndex + 1];
+  const remainingUnitCount = remainingMs / UNIT_MS[remainingUnitName];
   // - 1 year and 1 second is too much information
   //   so we don't check the remaining units
   // - 1 year and 0.0001 week is awful

package/dist/start_dev_server/start_dev_server.js

@@ -5529,7 +5529,7 @@ const jsenvPluginInlineContentFetcher = () => {
        * BUT the last reference is the "http_request"
        * so it's more likely the before last reference that contains the latest version
        *
-       * BUT the is an exception when using supervisor as the before last reference
+       * BUT there is an exception when using supervisor as the before last reference
        * is the one fetched by the browser that is already cooked
        * we must re-cook from the original content, not from the already cooked content
        * Otherwise references are already resolved and
@@ -9873,6 +9873,7 @@ const startDevServer = async ({
                 type: "http_request",
                 specifier: request.resource,
               });
+              reference.urlInfo.context.requestedUrl = requestedUrl;
               rootUrlInfo.context.request = null;
               rootUrlInfo.context.requestedUrl = null;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "40.12.0",
+  "version": "40.12.2",
   "description": "Tool to develop, test and build js projects",
   "repository": {
     "type": "git",
@@ -75,14 +75,14 @@
   },
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
-    "@jsenv/ast": "6.7.16",
-    "@jsenv/js-module-fallback": "1.4.24",
-    "@jsenv/plugin-bundling": "2.10.3",
+    "@jsenv/ast": "6.7.17",
+    "@jsenv/js-module-fallback": "1.4.25",
+    "@jsenv/plugin-bundling": "2.10.4",
     "@jsenv/plugin-minification": "1.7.3",
-    "@jsenv/plugin-supervisor": "1.7.10",
-    "@jsenv/plugin-transpilation": "1.5.63",
-    "@jsenv/server": "16.3.3",
-    "@jsenv/sourcemap": "1.3.12",
+    "@jsenv/plugin-supervisor": "1.7.11",
+    "@jsenv/plugin-transpilation": "1.5.65",
+    "@jsenv/server": "16.3.4",
+    "@jsenv/sourcemap": "1.3.13",
     "react-table": "7.8.0"
   },
   "devDependencies": {

package/src/dev/start_dev_server.js

@@ -467,6 +467,7 @@ export const startDevServer = async ({
                 type: "http_request",
                 specifier: request.resource,
               });
+              reference.urlInfo.context.requestedUrl = requestedUrl;
               rootUrlInfo.context.request = null;
               rootUrlInfo.context.requestedUrl = null;
             }

package/src/plugins/reference_analysis/jsenv_plugin_reference_analysis.js

@@ -48,7 +48,7 @@ const jsenvPluginInlineContentFetcher = () => {
        * BUT the last reference is the "http_request"
        * so it's more likely the before last reference that contains the latest version
        *
-       * BUT the is an exception when using supervisor as the before last reference
+       * BUT there is an exception when using supervisor as the before last reference
        * is the one fetched by the browser that is already cooked
        * we must re-cook from the original content, not from the already cooked content
        * Otherwise references are already resolved and