@jsenv/plugin-supervisor 1.4.15 → 1.5.0

package/dist/jsenv_plugin_supervisor.js

@@ -4,7 +4,7 @@ import process$1 from "node:process";
 import os from "node:os";
 import tty from "node:tty";
 import "string-width";
-import { applyBabelPlugins, parseHtml, visitHtmlNodes, analyzeScriptNode, getHtmlNodeAttribute, getHtmlNodeText, injectHtmlNodeAsEarlyAsPossible, createHtmlNode, stringifyHtmlAst, getHtmlNodePosition, getUrlForContentInsideHtml, setHtmlNodeText, setHtmlNodeAttributes } from "@jsenv/ast";
+import { applyBabelPlugins, parseHtml, visitHtmlNodes, analyzeScriptNode, getHtmlNodeAttribute, getHtmlNodeText, injectJsenvScript, stringifyHtmlAst, getHtmlNodePosition, getUrlForContentInsideHtml, setHtmlNodeText, setHtmlNodeAttributes } from "@jsenv/ast";
 
 const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 const intToChar = new Uint8Array(64); // 64 possible chars.
@@ -210,7 +210,7 @@ const createAnsi = ({
       if (!color) {
         return text;
       }
-      if (text.trim() === "") {
+      if (typeof text === "string" && text.trim() === "") {
         // cannot set color of blank chars
         return text;
       }
@@ -1140,20 +1140,19 @@ const injectSupervisorIntoHTML = async ({
   }
   // 2. Inject supervisor js file + setup call
   {
-    const setupParamsSource = stringifyParams({
-      ...supervisorOptions,
-      serverIsJsenvDevServer: webServer.isJsenvDevServer,
-      rootDirectoryUrl: webServer.rootDirectoryUrl,
-      scriptInfos
-    }, "  ");
-    injectHtmlNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
-      tagName: "script",
-      textContent: "window.__supervisor__.setup({\n  ".concat(setupParamsSource, "\n});")
-    }), "jsenv:supervisor");
-    injectHtmlNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
-      tagName: "script",
-      src: supervisorScriptSrc
-    }), "jsenv:supervisor");
+    injectJsenvScript(htmlAst, {
+      src: supervisorScriptSrc,
+      initCall: {
+        callee: "window.__supervisor__.setup",
+        params: {
+          ...supervisorOptions,
+          serverIsJsenvDevServer: webServer.isJsenvDevServer,
+          rootDirectoryUrl: webServer.rootDirectoryUrl,
+          scriptInfos
+        }
+      },
+      pluginName: "jsenv:supervisor"
+    });
   }
   // 3. Perform actions (transforming inline script content) and html mutations
   if (actions.length > 0) {
@@ -1165,18 +1164,6 @@ const injectSupervisorIntoHTML = async ({
     content: htmlModified
   };
 };
-const stringifyParams = (params, prefix = "") => {
-  const source = JSON.stringify(params, null, prefix);
-  if (prefix.length) {
-    // remove leading "{\n"
-    // remove leading prefix
-    // remove trailing "\n}"
-    return source.slice(2 + prefix.length, -2);
-  }
-  // remove leading "{"
-  // remove trailing "}"
-  return source.slice(1, -1);
-};
 const generateCodeToSuperviseScriptWithSrc = ({
   type,
   src

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-supervisor",
-  "version": "1.4.15",
+  "version": "1.5.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,9 +26,9 @@
     "/dist/"
   ],
   "dependencies": {
-    "@jsenv/ast": "6.1.3",
-    "@jsenv/urls": "2.2.9",
-    "@jsenv/sourcemap": "1.2.12",
+    "@jsenv/ast": "6.2.1",
+    "@jsenv/urls": "2.2.10",
+    "@jsenv/sourcemap": "1.2.13",
     "launch-editor": "2.8.0"
   },
   "scripts": {

package/src/html_supervisor.js

@@ -52,8 +52,7 @@ import {
   getHtmlNodeAttribute,
   setHtmlNodeAttributes,
   analyzeScriptNode,
-  injectHtmlNodeAsEarlyAsPossible,
-  createHtmlNode,
+  injectJsenvScript,
   getHtmlNodePosition,
   getHtmlNodeText,
   setHtmlNodeText,
@@ -224,33 +223,19 @@ export const injectSupervisorIntoHTML = async (
   }
   // 2. Inject supervisor js file + setup call
   {
-    const setupParamsSource = stringifyParams(
-      {
-        ...supervisorOptions,
-        serverIsJsenvDevServer: webServer.isJsenvDevServer,
-        rootDirectoryUrl: webServer.rootDirectoryUrl,
-        scriptInfos,
+    injectJsenvScript(htmlAst, {
+      src: supervisorScriptSrc,
+      initCall: {
+        callee: "window.__supervisor__.setup",
+        params: {
+          ...supervisorOptions,
+          serverIsJsenvDevServer: webServer.isJsenvDevServer,
+          rootDirectoryUrl: webServer.rootDirectoryUrl,
+          scriptInfos,
+        },
       },
-      "  ",
-    );
-    injectHtmlNodeAsEarlyAsPossible(
-      htmlAst,
-      createHtmlNode({
-        tagName: "script",
-        textContent: `window.__supervisor__.setup({
-  ${setupParamsSource}
-});`,
-      }),
-      "jsenv:supervisor",
-    );
-    injectHtmlNodeAsEarlyAsPossible(
-      htmlAst,
-      createHtmlNode({
-        tagName: "script",
-        src: supervisorScriptSrc,
-      }),
-      "jsenv:supervisor",
-    );
+      pluginName: "jsenv:supervisor",
+    });
   }
   // 3. Perform actions (transforming inline script content) and html mutations
   if (actions.length > 0) {
@@ -263,19 +248,6 @@ export const injectSupervisorIntoHTML = async (
   };
 };
 
-const stringifyParams = (params, prefix = "") => {
-  const source = JSON.stringify(params, null, prefix);
-  if (prefix.length) {
-    // remove leading "{\n"
-    // remove leading prefix
-    // remove trailing "\n}"
-    return source.slice(2 + prefix.length, -2);
-  }
-  // remove leading "{"
-  // remove trailing "}"
-  return source.slice(1, -1);
-};
-
 const generateCodeToSuperviseScriptWithSrc = ({ type, src }) => {
   const srcEncoded = JSON.stringify(src);
   if (type === "js_module") {