@jsenv/core 41.4.4 → 41.4.5

package/dist/build/build.js

@@ -333,6 +333,7 @@ ${reason}`,
   }
   return createFailedToResolveUrlError({
     reason: `An error occured during specifier resolution`,
+    ...detailsFromInjectionsOnOwner(reference),
     ...detailsFromValueThrown(error),
   });
 };
@@ -394,6 +395,7 @@ ${reason}`,
       return createFailedToFetchUrlContentError({
         code: "NOT_FOUND",
         reason: "no entry on filesystem",
+        ...detailsFromInjectionsOnOwner(urlInfo.firstReference),
       });
     }
   }
@@ -626,6 +628,32 @@ const getFirstReferenceInProject = (reference) => {
   return getFirstReferenceInProject(firstReference);
 };
 
+// An url written by an injection cannot be resolved: the placeholder is still there
+// when references are analyzed. Rather than guessing what a placeholder looks like
+// (the key is free-form), tell the file it comes from: injections are configured for it.
+const detailsFromInjectionsOnOwner = (reference) => {
+  if (!reference) {
+    return {};
+  }
+  const ownerUrlInfo = reference.ownerUrlInfo;
+  if (ownerUrlInfo.type !== "html") {
+    // "jsenv-ignore" is an html attribute
+    return {};
+  }
+  const { hasInjections } = ownerUrlInfo.context;
+  if (!hasInjections || !hasInjections(ownerUrlInfo.url)) {
+    return {};
+  }
+  const { node, attributeName } = reference.astInfo || {};
+  if (!node || !attributeName) {
+    return {};
+  }
+  return {
+    suggestion: `injections are configured for this file; when "${reference.specifier}" is meant to be written by one of them, add "jsenv-ignore" so jsenv leaves that url alone:
+<${node.nodeName} jsenv-ignore ${attributeName}="${reference.specifier}" />`,
+  };
+};
+
 const detailsFromPluginController = (jsenvPluginsController) => {
   const currentPlugin = jsenvPluginsController.getCurrentPlugin();
   if (!currentPlugin) {
@@ -2511,7 +2539,14 @@ const injectGlobals = (content, globals, urlInfo) => {
   if (urlInfo.type === "js_classic" || urlInfo.type === "js_module") {
     return globalsInjectorOnJs(content, globals, urlInfo);
   }
-  throw new Error(`cannot inject globals into "${urlInfo.type}"`);
+  throw new Error(
+    createDetailedMessage(`cannot inject globals into "${urlInfo.type}"`, {
+      file: urlInfo.url,
+      ...(urlInfo.isInline
+        ? { "inline content of": urlInfo.inlineUrlSite.url }
+        : {}),
+    }),
+  );
 };
 const globalInjectorOnHtml = (content, globals, urlInfo) => {
   // ideally we would inject an importmap but browser support is too low
@@ -7652,11 +7687,20 @@ const jsenvPluginInjections = (rawAssociations) => {
           { injectionsGetter: rawAssociations },
           context.rootDirectoryUrl,
         );
-        const findInjectionsGetter = (urlInfo) => {
+        const findInjectionsGetterForUrl = (url) => {
           const { injectionsGetter } = URL_META.applyAssociations({
-            url: asUrlWithoutSearch(urlInfo.url),
+            url: asUrlWithoutSearch(url),
             associations: resolvedAssociations,
           });
+          return injectionsGetter;
+        };
+        // an url written by an injection cannot be resolved during reference analysis;
+        // errors use this to tell the file holds injections and suggest "jsenv-ignore"
+        context.hasInjections = (url) => {
+          return Boolean(findInjectionsGetterForUrl(url));
+        };
+        const findInjectionsGetter = (urlInfo) => {
+          const injectionsGetter = findInjectionsGetterForUrl(urlInfo.url);
           if (injectionsGetter) {
             return { injectionsGetter, isInherited: false };
           }
@@ -7688,9 +7732,7 @@ const jsenvPluginInjections = (rawAssociations) => {
           if (!injections || !isInherited) {
             return injections;
           }
-          // the file holds several inline contents; a placeholder configured for the file
-          // is expected in one of them, not in each
-          return asOptionalInjections(injections);
+          return asInheritedInjections(injections);
         };
       }
     },
@@ -7717,12 +7759,24 @@ const jsenvPluginInjections = (rawAssociations) => {
   };
 };
 
-const asOptionalInjections = (injections) => {
-  const optionalInjections = {};
+// What a file inlines (a <script> or a <style> inside html) is authored in that file
+// and inherits its injections, with two adjustments:
+// - a global belongs to the file itself, injecting it into each inline content would
+//   repeat it and reach types that cannot receive globals (css)
+// - a placeholder configured for the file is expected in one of its inline contents,
+//   not in each, so a missing one is not worth a warning
+const asInheritedInjections = (injections) => {
+  const inheritedInjections = {};
   for (const key of Object.keys(injections)) {
-    optionalInjections[key] = INJECTIONS.optional(injections[key]);
+    const value = injections[key];
+    if (isPlaceholderInjection(value)) {
+      inheritedInjections[key] = INJECTIONS.optional(value);
+    }
+  }
+  if (Object.keys(inheritedInjections).length === 0) {
+    return null;
   }
-  return optionalInjections;
+  return inheritedInjections;
 };
 
 /*

package/dist/client/html_syntax_error/html_syntax_error.html

@@ -8,7 +8,7 @@
 
   <body>
     <p>Syntax error: <strong>${reasonCode}</strong></p>
-    <a jsenv-ignore="" href="${errorLinkHref}">${errorLinkText}</a>
+    <a href="${errorLinkHref}">${errorLinkText}</a>
     ${syntaxErrorHTML}
   </body>
 </html>

package/dist/start_dev_server/start_dev_server.js

@@ -4563,6 +4563,7 @@ ${reason}`,
   }
   return createFailedToResolveUrlError({
     reason: `An error occured during specifier resolution`,
+    ...detailsFromInjectionsOnOwner(reference),
     ...detailsFromValueThrown(error),
   });
 };
@@ -4624,6 +4625,7 @@ ${reason}`,
       return createFailedToFetchUrlContentError({
         code: "NOT_FOUND",
         reason: "no entry on filesystem",
+        ...detailsFromInjectionsOnOwner(urlInfo.firstReference),
       });
     }
   }
@@ -4856,6 +4858,32 @@ const getFirstReferenceInProject = (reference) => {
   return getFirstReferenceInProject(firstReference);
 };
 
+// An url written by an injection cannot be resolved: the placeholder is still there
+// when references are analyzed. Rather than guessing what a placeholder looks like
+// (the key is free-form), tell the file it comes from: injections are configured for it.
+const detailsFromInjectionsOnOwner = (reference) => {
+  if (!reference) {
+    return {};
+  }
+  const ownerUrlInfo = reference.ownerUrlInfo;
+  if (ownerUrlInfo.type !== "html") {
+    // "jsenv-ignore" is an html attribute
+    return {};
+  }
+  const { hasInjections } = ownerUrlInfo.context;
+  if (!hasInjections || !hasInjections(ownerUrlInfo.url)) {
+    return {};
+  }
+  const { node, attributeName } = reference.astInfo || {};
+  if (!node || !attributeName) {
+    return {};
+  }
+  return {
+    suggestion: `injections are configured for this file; when "${reference.specifier}" is meant to be written by one of them, add "jsenv-ignore" so jsenv leaves that url alone:
+<${node.nodeName} jsenv-ignore ${attributeName}="${reference.specifier}" />`,
+  };
+};
+
 const detailsFromPluginController = (jsenvPluginsController) => {
   const currentPlugin = jsenvPluginsController.getCurrentPlugin();
   if (!currentPlugin) {
@@ -5145,7 +5173,14 @@ const injectGlobals = (content, globals, urlInfo) => {
   if (urlInfo.type === "js_classic" || urlInfo.type === "js_module") {
     return globalsInjectorOnJs(content, globals, urlInfo);
   }
-  throw new Error(`cannot inject globals into "${urlInfo.type}"`);
+  throw new Error(
+    createDetailedMessage(`cannot inject globals into "${urlInfo.type}"`, {
+      file: urlInfo.url,
+      ...(urlInfo.isInline
+        ? { "inline content of": urlInfo.inlineUrlSite.url }
+        : {}),
+    }),
+  );
 };
 const globalInjectorOnHtml = (content, globals, urlInfo) => {
   // ideally we would inject an importmap but browser support is too low
@@ -5211,11 +5246,20 @@ const jsenvPluginInjections = (rawAssociations) => {
           { injectionsGetter: rawAssociations },
           context.rootDirectoryUrl,
         );
-        const findInjectionsGetter = (urlInfo) => {
+        const findInjectionsGetterForUrl = (url) => {
           const { injectionsGetter } = URL_META.applyAssociations({
-            url: asUrlWithoutSearch(urlInfo.url),
+            url: asUrlWithoutSearch(url),
             associations: resolvedAssociations,
           });
+          return injectionsGetter;
+        };
+        // an url written by an injection cannot be resolved during reference analysis;
+        // errors use this to tell the file holds injections and suggest "jsenv-ignore"
+        context.hasInjections = (url) => {
+          return Boolean(findInjectionsGetterForUrl(url));
+        };
+        const findInjectionsGetter = (urlInfo) => {
+          const injectionsGetter = findInjectionsGetterForUrl(urlInfo.url);
           if (injectionsGetter) {
             return { injectionsGetter, isInherited: false };
           }
@@ -5247,9 +5291,7 @@ const jsenvPluginInjections = (rawAssociations) => {
           if (!injections || !isInherited) {
             return injections;
           }
-          // the file holds several inline contents; a placeholder configured for the file
-          // is expected in one of them, not in each
-          return asOptionalInjections(injections);
+          return asInheritedInjections(injections);
         };
       }
     },
@@ -5276,12 +5318,24 @@ const jsenvPluginInjections = (rawAssociations) => {
   };
 };
 
-const asOptionalInjections = (injections) => {
-  const optionalInjections = {};
+// What a file inlines (a <script> or a <style> inside html) is authored in that file
+// and inherits its injections, with two adjustments:
+// - a global belongs to the file itself, injecting it into each inline content would
+//   repeat it and reach types that cannot receive globals (css)
+// - a placeholder configured for the file is expected in one of its inline contents,
+//   not in each, so a missing one is not worth a warning
+const asInheritedInjections = (injections) => {
+  const inheritedInjections = {};
   for (const key of Object.keys(injections)) {
-    optionalInjections[key] = INJECTIONS.optional(injections[key]);
+    const value = injections[key];
+    if (isPlaceholderInjection(value)) {
+      inheritedInjections[key] = INJECTIONS.optional(value);
+    }
+  }
+  if (Object.keys(inheritedInjections).length === 0) {
+    return null;
   }
-  return optionalInjections;
+  return inheritedInjections;
 };
 
 const jsenvPluginInliningAsDataUrl = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "41.4.4",
+  "version": "41.4.5",
   "type": "module",
   "description": "Tool to develop, test and build js projects",
   "repository": {
@@ -72,12 +72,12 @@
     "test:snapshot_clear": "npx @jsenv/filesystem clear **/tests/**/side_effects/"
   },
   "dependencies": {
-    "@jsenv/ast": "6.8.4",
-    "@jsenv/js-module-fallback": "1.4.37",
+    "@jsenv/ast": "6.8.5",
+    "@jsenv/js-module-fallback": "1.4.38",
     "@jsenv/plugin-bundling": "2.10.16",
-    "@jsenv/plugin-minification": "1.7.5",
-    "@jsenv/plugin-supervisor": "1.8.8",
-    "@jsenv/plugin-transpilation": "1.5.78",
+    "@jsenv/plugin-minification": "1.7.6",
+    "@jsenv/plugin-supervisor": "1.8.9",
+    "@jsenv/plugin-transpilation": "1.5.79",
     "@jsenv/server": "17.6.0",
     "@jsenv/sourcemap": "1.4.2",
     "react-table": "7.8.0"

package/src/kitchen/errors.js

@@ -78,6 +78,7 @@ ${reason}`,
   }
   return createFailedToResolveUrlError({
     reason: `An error occured during specifier resolution`,
+    ...detailsFromInjectionsOnOwner(reference),
     ...detailsFromValueThrown(error),
   });
 };
@@ -139,6 +140,7 @@ ${reason}`,
       return createFailedToFetchUrlContentError({
         code: "NOT_FOUND",
         reason: "no entry on filesystem",
+        ...detailsFromInjectionsOnOwner(urlInfo.firstReference),
       });
     }
   }
@@ -371,6 +373,32 @@ const getFirstReferenceInProject = (reference) => {
   return getFirstReferenceInProject(firstReference);
 };
 
+// An url written by an injection cannot be resolved: the placeholder is still there
+// when references are analyzed. Rather than guessing what a placeholder looks like
+// (the key is free-form), tell the file it comes from: injections are configured for it.
+const detailsFromInjectionsOnOwner = (reference) => {
+  if (!reference) {
+    return {};
+  }
+  const ownerUrlInfo = reference.ownerUrlInfo;
+  if (ownerUrlInfo.type !== "html") {
+    // "jsenv-ignore" is an html attribute
+    return {};
+  }
+  const { hasInjections } = ownerUrlInfo.context;
+  if (!hasInjections || !hasInjections(ownerUrlInfo.url)) {
+    return {};
+  }
+  const { node, attributeName } = reference.astInfo || {};
+  if (!node || !attributeName) {
+    return {};
+  }
+  return {
+    suggestion: `injections are configured for this file; when "${reference.specifier}" is meant to be written by one of them, add "jsenv-ignore" so jsenv leaves that url alone:
+<${node.nodeName} jsenv-ignore ${attributeName}="${reference.specifier}" />`,
+  };
+};
+
 const detailsFromPluginController = (jsenvPluginsController) => {
   const currentPlugin = jsenvPluginsController.getCurrentPlugin();
   if (!currentPlugin) {

package/src/kitchen/url_graph/url_info_injections.js

@@ -1,4 +1,5 @@
 import { injectJsenvScript, parseHtml, stringifyHtmlAst } from "@jsenv/ast";
+import { createDetailedMessage } from "@jsenv/humanize";
 import { composeTwoSourcemaps, createMagicSource } from "@jsenv/sourcemap";
 
 const injectionSymbol = Symbol.for("jsenv_injection");
@@ -150,7 +151,14 @@ export const injectGlobals = (content, globals, urlInfo) => {
   if (urlInfo.type === "js_classic" || urlInfo.type === "js_module") {
     return globalsInjectorOnJs(content, globals, urlInfo);
   }
-  throw new Error(`cannot inject globals into "${urlInfo.type}"`);
+  throw new Error(
+    createDetailedMessage(`cannot inject globals into "${urlInfo.type}"`, {
+      file: urlInfo.url,
+      ...(urlInfo.isInline
+        ? { "inline content of": urlInfo.inlineUrlSite.url }
+        : {}),
+    }),
+  );
 };
 const globalInjectorOnHtml = (content, globals, urlInfo) => {
   // ideally we would inject an importmap but browser support is too low

package/src/plugins/injections/jsenv_plugin_injections.js

@@ -1,6 +1,9 @@
 import { URL_META } from "@jsenv/url-meta";
 import { asUrlWithoutSearch, urlToRelativeUrl } from "@jsenv/urls";
-import { INJECTIONS } from "../../kitchen/url_graph/url_info_injections.js";
+import {
+  INJECTIONS,
+  isPlaceholderInjection,
+} from "../../kitchen/url_graph/url_info_injections.js";
 
 export const jsenvPluginInjections = (rawAssociations) => {
   const getDefaultInjections = (urlInfo) => {
@@ -26,11 +29,20 @@ export const jsenvPluginInjections = (rawAssociations) => {
           { injectionsGetter: rawAssociations },
           context.rootDirectoryUrl,
         );
-        const findInjectionsGetter = (urlInfo) => {
+        const findInjectionsGetterForUrl = (url) => {
           const { injectionsGetter } = URL_META.applyAssociations({
-            url: asUrlWithoutSearch(urlInfo.url),
+            url: asUrlWithoutSearch(url),
             associations: resolvedAssociations,
           });
+          return injectionsGetter;
+        };
+        // an url written by an injection cannot be resolved during reference analysis;
+        // errors use this to tell the file holds injections and suggest "jsenv-ignore"
+        context.hasInjections = (url) => {
+          return Boolean(findInjectionsGetterForUrl(url));
+        };
+        const findInjectionsGetter = (urlInfo) => {
+          const injectionsGetter = findInjectionsGetterForUrl(urlInfo.url);
           if (injectionsGetter) {
             return { injectionsGetter, isInherited: false };
           }
@@ -62,9 +74,7 @@ export const jsenvPluginInjections = (rawAssociations) => {
           if (!injections || !isInherited) {
             return injections;
           }
-          // the file holds several inline contents; a placeholder configured for the file
-          // is expected in one of them, not in each
-          return asOptionalInjections(injections);
+          return asInheritedInjections(injections);
         };
       }
     },
@@ -91,10 +101,22 @@ export const jsenvPluginInjections = (rawAssociations) => {
   };
 };
 
-const asOptionalInjections = (injections) => {
-  const optionalInjections = {};
+// What a file inlines (a <script> or a <style> inside html) is authored in that file
+// and inherits its injections, with two adjustments:
+// - a global belongs to the file itself, injecting it into each inline content would
+//   repeat it and reach types that cannot receive globals (css)
+// - a placeholder configured for the file is expected in one of its inline contents,
+//   not in each, so a missing one is not worth a warning
+const asInheritedInjections = (injections) => {
+  const inheritedInjections = {};
   for (const key of Object.keys(injections)) {
-    optionalInjections[key] = INJECTIONS.optional(injections[key]);
+    const value = injections[key];
+    if (isPlaceholderInjection(value)) {
+      inheritedInjections[key] = INJECTIONS.optional(value);
+    }
+  }
+  if (Object.keys(inheritedInjections).length === 0) {
+    return null;
   }
-  return optionalInjections;
+  return inheritedInjections;
 };