@jsenv/plugin-supervisor 1.2.0 → 1.3.0

package/dist/jsenv_plugin_supervisor.js

@@ -1,6 +1,6 @@
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
-import { applyBabelPlugins, parseHtmlString, visitHtmlNodes, analyzeScriptNode, getHtmlNodeAttribute, getHtmlNodeText, injectHtmlNodeAsEarlyAsPossible, createHtmlNode, stringifyHtmlAst, getHtmlNodePosition, setHtmlNodeText, setHtmlNodeAttributes } from "@jsenv/ast";
+import { applyBabelPlugins, parseHtmlString, visitHtmlNodes, analyzeScriptNode, getHtmlNodeAttribute, getHtmlNodeText, injectHtmlNodeAsEarlyAsPossible, createHtmlNode, stringifyHtmlAst, getHtmlNodePosition, getUrlForContentInsideHtml, setHtmlNodeText, setHtmlNodeAttributes } from "@jsenv/ast";
 
 const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 const intToChar = new Uint8Array(64); // 64 possible chars.
@@ -44,85 +44,6 @@ const getOriginalPosition = ({
   return originalPosition;
 };
 
-const urlToScheme = url => {
-  const urlString = String(url);
-  const colonIndex = urlString.indexOf(":");
-  if (colonIndex === -1) {
-    return "";
-  }
-  const scheme = urlString.slice(0, colonIndex);
-  return scheme;
-};
-
-const urlToResource = url => {
-  const scheme = urlToScheme(url);
-  if (scheme === "file") {
-    const urlAsStringWithoutFileProtocol = String(url).slice("file://".length);
-    return urlAsStringWithoutFileProtocol;
-  }
-  if (scheme === "https" || scheme === "http") {
-    // remove origin
-    const afterProtocol = String(url).slice(scheme.length + "://".length);
-    const pathnameSlashIndex = afterProtocol.indexOf("/", "://".length);
-    const urlAsStringWithoutOrigin = afterProtocol.slice(pathnameSlashIndex);
-    return urlAsStringWithoutOrigin;
-  }
-  const urlAsStringWithoutProtocol = String(url).slice(scheme.length + 1);
-  return urlAsStringWithoutProtocol;
-};
-
-const urlToPathname = url => {
-  const resource = urlToResource(url);
-  const pathname = resourceToPathname(resource);
-  return pathname;
-};
-const resourceToPathname = resource => {
-  const searchSeparatorIndex = resource.indexOf("?");
-  if (searchSeparatorIndex > -1) {
-    return resource.slice(0, searchSeparatorIndex);
-  }
-  const hashIndex = resource.indexOf("#");
-  if (hashIndex > -1) {
-    return resource.slice(0, hashIndex);
-  }
-  return resource;
-};
-
-const urlToFilename = url => {
-  const pathname = urlToPathname(url);
-  const pathnameBeforeLastSlash = pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
-  const slashLastIndex = pathnameBeforeLastSlash.lastIndexOf("/");
-  const filename = slashLastIndex === -1 ? pathnameBeforeLastSlash : pathnameBeforeLastSlash.slice(slashLastIndex + 1);
-  return filename;
-};
-
-const generateInlineContentUrl = ({
-  url,
-  extension,
-  basename,
-  line,
-  column,
-  lineEnd,
-  columnEnd
-}) => {
-  let generatedName = "";
-  if (basename !== undefined) {
-    generatedName += basename;
-  }
-  if (line !== undefined && column !== undefined) {
-    generatedName = "L".concat(line, "C").concat(column);
-    if (lineEnd !== undefined && columnEnd !== undefined) {
-      generatedName += "-L".concat(lineEnd, "C").concat(columnEnd);
-    }
-  }
-  const filenameRaw = urlToFilename(url);
-  const filename = "".concat(filenameRaw, "@").concat(generatedName).concat(extension);
-  // ideally we should keep query params from url
-  // maybe we could use a custom scheme like "inline:"
-  const inlineContentUrl = new URL(filename, url).href;
-  return inlineContentUrl;
-};
-
 // consider switching to https://babeljs.io/docs/en/babel-code-frame
 // https://github.com/postcss/postcss/blob/fd30d3df5abc0954a0ec642a3cdc644ab2aacf9c/lib/css-syntax-error.js#L43
 // https://github.com/postcss/postcss/blob/fd30d3df5abc0954a0ec642a3cdc644ab2aacf9c/lib/terminal-highlight.js#L50
@@ -397,6 +318,16 @@ const SOURCEMAP = {
     }[contentType];
     return read ? read(content) : null;
   },
+  removeComment: ({
+    contentType,
+    content
+  }) => {
+    return SOURCEMAP.writeComment({
+      contentType,
+      content,
+      specifier: ""
+    });
+  },
   writeComment: ({
     contentType,
     content,
@@ -471,8 +402,12 @@ const javascriptSourceMappingUrlCommentRegexp = /\/\/ ?# ?sourceMappingURL=([^\s
 const cssSourceMappingUrlCommentRegExp = /\/\*# ?sourceMappingURL=([^\s'"]+) \*\//g;
 
 // ${"//#"} is to avoid a parser thinking there is a sourceMappingUrl for this file
-const writeJavaScriptSourceMappingURL = value => "//#".concat(" sourceMappingURL=", value);
-const writeCssSourceMappingUrl = value => "/*# sourceMappingURL=".concat(value, " */");
+const writeJavaScriptSourceMappingURL = value => {
+  return "//#".concat(" sourceMappingURL=", value);
+};
+const writeCssSourceMappingUrl = value => {
+  return "/*# sourceMappingURL=".concat(value, " */");
+};
 const replaceSourceMappingUrl = (source, regexp, callback) => {
   let lastSourceMappingUrl;
   let matchSourceMappingUrl;
@@ -777,25 +712,17 @@ const injectSupervisorIntoHTML = async ({
   {
     const handleInlineScript = (scriptNode, {
       type,
-      extension,
       textContent
     }) => {
       const {
         line,
         column,
-        lineEnd,
-        columnEnd,
         isOriginal
       } = getHtmlNodePosition(scriptNode, {
         preferOriginal: true
       });
-      const inlineScriptUrl = generateInlineContentUrl({
-        url,
-        extension: extension || ".js",
-        line,
-        column,
-        lineEnd,
-        columnEnd
+      const inlineScriptUrl = getUrlForContentInsideHtml(scriptNode, {
+        htmlUrl: url
       });
       const inlineScriptSrc = generateInlineScriptSrc({
         type,
@@ -898,8 +825,7 @@ const injectSupervisorIntoHTML = async ({
     visitHtmlNodes(htmlAst, {
       script: scriptNode => {
         const {
-          type,
-          extension
+          type
         } = analyzeScriptNode(scriptNode);
         if (type !== "js_classic" && type !== "js_module") {
           return;
@@ -915,7 +841,6 @@ const injectSupervisorIntoHTML = async ({
         if (scriptNodeText) {
           handleInlineScript(scriptNode, {
             type,
-            extension,
             textContent: scriptNodeText
           });
           return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-supervisor",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,9 +26,9 @@
     "/dist/"
   ],
   "dependencies": {
-    "@jsenv/ast": "5.0.0",
-    "@jsenv/urls": "2.1.0",
-    "@jsenv/sourcemap": "1.1.0",
+    "@jsenv/ast": "5.1.0",
+    "@jsenv/urls": "2.2.0",
+    "@jsenv/sourcemap": "1.2.0",
     "launch-editor": "2.6.0"
   },
   "scripts": {

package/src/html_supervisor.js

@@ -57,8 +57,9 @@ import {
   getHtmlNodePosition,
   getHtmlNodeText,
   setHtmlNodeText,
+  getUrlForContentInsideHtml,
 } from "@jsenv/ast";
-import { generateInlineContentUrl, urlToRelativeUrl } from "@jsenv/urls";
+import { urlToRelativeUrl } from "@jsenv/urls";
 
 import { injectSupervisorIntoJs } from "./js_supervisor.js";
 
@@ -86,19 +87,12 @@ export const injectSupervisorIntoHTML = async (
   const scriptInfos = [];
   // 1. Find inline and remote scripts
   {
-    const handleInlineScript = (
-      scriptNode,
-      { type, extension, textContent },
-    ) => {
-      const { line, column, lineEnd, columnEnd, isOriginal } =
-        getHtmlNodePosition(scriptNode, { preferOriginal: true });
-      const inlineScriptUrl = generateInlineContentUrl({
-        url,
-        extension: extension || ".js",
-        line,
-        column,
-        lineEnd,
-        columnEnd,
+    const handleInlineScript = (scriptNode, { type, textContent }) => {
+      const { line, column, isOriginal } = getHtmlNodePosition(scriptNode, {
+        preferOriginal: true,
+      });
+      const inlineScriptUrl = getUrlForContentInsideHtml(scriptNode, {
+        htmlUrl: url,
       });
       const inlineScriptSrc = generateInlineScriptSrc({
         type,
@@ -187,7 +181,7 @@ export const injectSupervisorIntoHTML = async (
     };
     visitHtmlNodes(htmlAst, {
       script: (scriptNode) => {
-        const { type, extension } = analyzeScriptNode(scriptNode);
+        const { type } = analyzeScriptNode(scriptNode);
         if (type !== "js_classic" && type !== "js_module") {
           return;
         }
@@ -203,7 +197,6 @@ export const injectSupervisorIntoHTML = async (
         if (scriptNodeText) {
           handleInlineScript(scriptNode, {
             type,
-            extension,
             textContent: scriptNodeText,
           });
           return;