Merge pull request #438 from jsenv/bare_specifier_improve

Bare specifier improve
jsenv · Nov 6, 2024 · 4746e40 · 4746e40
2 parents 74db996 + 6423eae
commit 4746e40
Show file tree

Hide file tree

Showing 42 changed files with 266 additions and 66 deletions.
diff --git a/dist/jsenv_core.js b/dist/jsenv_core.js
@@ -11591,6 +11591,7 @@ const createResolveUrlError = ({
   error,
 }) => {
   const createFailedToResolveUrlError = ({
+    name = "RESOLVE_URL_ERROR",
     code = error.code || "RESOLVE_URL_ERROR",
     reason,
     ...details
@@ -11609,10 +11610,11 @@ ${reason}`,
     );
     defineNonEnumerableProperties(resolveError, {
       isJsenvCookingError: true,
-      name: "RESOLVE_URL_ERROR",
+      name,
       code,
       reason,
       asResponse: error.asResponse,
+      trace: error.trace || reference.trace,
     });
     return resolveError;
   };
@@ -11621,6 +11623,12 @@ ${reason}`,
       reason: `no plugin has handled the specifier during "resolveUrl" hook`,
     });
   }
+  if (error.code === "MODULE_NOT_FOUND") {
+    const bareSpecifierError = createFailedToResolveUrlError({
+      reason: `"${reference.specifier}" is a bare specifier but cannot be remapped to a package`,
+    });
+    return bareSpecifierError;
+  }
   if (error.code === "DIRECTORY_REFERENCE_NOT_ALLOWED") {
     error.message = createDetailedMessage$1(error.message, {
       "reference trace": reference.trace.message,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "39.5.17",
+  "version": "39.5.18",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -78,7 +78,7 @@
     "@jsenv/node-esm-resolution": "1.0.6",
     "@jsenv/plugin-bundling": "2.7.16",
     "@jsenv/plugin-minification": "1.5.10",
-    "@jsenv/plugin-supervisor": "1.5.23",
+    "@jsenv/plugin-supervisor": "1.5.24",
     "@jsenv/plugin-transpilation": "1.4.83",
     "@jsenv/runtime-compat": "1.3.1",
     "@jsenv/server": "15.3.1",

diff --git a/packages/independent/assert/dist/jsenv_assert_browser.js b/packages/independent/assert/dist/jsenv_assert_browser.js
@@ -2664,7 +2664,7 @@ const createAssert = ({
       comparison.hasAnyDiff = overall.any.size > 0;
       comparison.done = true;
       const updateNodeDiffType = (node, otherNode) => {
-        if (node.diffType !== "") {
+        if (node.diffType !== "" && !allowRecompare) {
           return;
         }
         let diffType = "";

diff --git a/packages/independent/assert/package.json b/packages/independent/assert/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/assert",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "One assertion to test everything",
   "license": "MIT",
   "repository": {

diff --git a/packages/independent/assert/src/assert_scratch.js b/packages/independent/assert/src/assert_scratch.js
@@ -751,7 +751,7 @@ export const createAssert = ({
       comparison.done = true;
 
       const updateNodeDiffType = (node, otherNode) => {
-        if (node.diffType !== "") {
+        if (node.diffType !== "" && !allowRecompare) {
           return;
         }
         let diffType = "";

diff --git a/..._between.test.js/3500_is_between_3000_and_5000/3500_is_between_3000_and_5000.md b/..._between.test.js/3500_is_between_3000_and_5000/3500_is_between_3000_and_5000.md
@@ -1,4 +1,4 @@
-# [3500 is between 3000 and 5000](../../assert_between.test.js#L37)
+# [3500 is between 3000 and 5000](../../assert_between.test.js#L47)
 
 ```js
 assert({

diff --git a/...ts/_assert_between.test.js/500_not_between_100__200/500_not_between_100__200.md b/...ts/_assert_between.test.js/500_not_between_100__200/500_not_between_100__200.md
@@ -0,0 +1,37 @@
+# [500 not between 100, 200](../../assert_between.test.js#L37)
+
+```js
+assert({
+  actual: {
+    duration: 500,
+  },
+  expect: {
+    duration: assert.between(100, 200),
+  },
+});
+```
+
+![img](throw.svg)
+
+<details>
+  <summary>see without style</summary>
+
+```console
+AssertionError: actual and expect are different
+
+actual: {
+  duration: 500,
+}
+expect: {
+  duration: assert.between(100, 200),
+}
+```
+
+</details>
+
+
+---
+
+<sub>
+  Generated by <a href="https://github.com/jsenv/core/tree/main/packages/independent/snapshot">@jsenv/snapshot</a>
+</sub>
diff --git a/...pendent/assert/tests/_assert_between.test.js/500_not_between_100__200/throw.svg b/...pendent/assert/tests/_assert_between.test.js/500_not_between_100__200/throw.svg
diff --git a/...ages/independent/assert/tests/_assert_between.test.js/assert_between.test.js.md b/...ages/independent/assert/tests/_assert_between.test.js/assert_between.test.js.md
@@ -5,6 +5,7 @@
 - [below or equals when removed](below_or_equals_when_removed/below_or_equals_when_removed.md)
 - [below or equals ok](below_or_equals_ok/below_or_equals_ok.md)
 - [50 is too small](50_is_too_small/50_is_too_small.md)
+- [500 not between 100, 200](500_not_between_100__200/500_not_between_100__200.md)
 - [3500 is between 3000 and 5000](3500_is_between_3000_and_5000/3500_is_between_3000_and_5000.md)
 
 ---

diff --git a/packages/independent/assert/tests/assert_between.test.js b/packages/independent/assert/tests/assert_between.test.js
@@ -34,6 +34,16 @@ await snapshotAssertTests(import.meta.url, ({ test }) => {
       expect: assert.between(100, 200),
     });
   });
+  test("500 not between 100, 200", () => {
+    assert({
+      actual: {
+        duration: 500,
+      },
+      expect: {
+        duration: assert.between(100, 200),
+      },
+    });
+  });
   test("3500 is between 3000 and 5000", () => {
     assert({
       actual: {

diff --git a/packages/independent/md-up/package.json b/packages/independent/md-up/package.json
@@ -2,6 +2,7 @@
   "name": "@jsenv/md-up",
   "version": "0.0.1",
   "license": "MIT",
+  "private": true,
   "repository": {
     "type": "git",
     "url": "https://github.com/jsenv/core",

diff --git a/packages/independent/snapshot/package.json b/packages/independent/snapshot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/snapshot",
-  "version": "2.11.15",
+  "version": "2.11.16",
   "description": "Snapshot testing",
   "license": "MIT",
   "author": {
@@ -30,7 +30,7 @@
     "/src/"
   ],
   "dependencies": {
-    "@jsenv/assert": "4.4.1",
+    "@jsenv/assert": "4.4.2",
     "@jsenv/ast": "6.3.4",
     "@jsenv/exception": "1.1.3",
     "@jsenv/humanize": "1.2.8",

diff --git a/packages/internal/plugin-supervisor/dist/js/supervisor.js b/packages/internal/plugin-supervisor/dist/js/supervisor.js
@@ -737,19 +737,19 @@ window.__supervisor__ = (() => {
       message,
       stackTrace
     }) => {
-      let stack = "";
+      const parts = [];
       if (codeFrame) {
-        stack += "".concat(codeFrame, "\n");
+        parts.push(codeFrame);
       }
       if (name && message) {
-        stack += "".concat(name, ": ").concat(message);
+        parts.push("".concat(name, ": ").concat(message));
       } else if (message) {
-        stack += message;
+        parts.push(message);
       }
       if (stackTrace) {
-        stack += "\n".concat(stackTrace);
+        parts.push(stackTrace);
       }
-      return stack;
+      return parts.join("\n");
     };
     const stringifyUrlSite = ({
       url,
@@ -972,13 +972,14 @@ window.__supervisor__ = (() => {
             const {
               trace = {}
             } = cause;
+            const dataToRender = cause.code === "MODULE_NOT_FOUND" ? cause : exception;
             root.querySelector(".text").innerHTML = stringifyStack({
               codeFrame: trace.codeFrame ? generateClickableText(trace.codeFrame) : "",
-              name: exception.name,
-              message: exception.message ? generateClickableText(exception.message) : "",
-              stackTrace: exception.stackTrace ? generateClickableText(exception.stackTrace) : ""
+              name: dataToRender.name,
+              message: cause.code === "MODULE_NOT_FOUND" ? generateClickableText(dataToRender.reason) : dataToRender.message ? generateClickableText(dataToRender.message) : "",
+              stackTrace: dataToRender.stackTrace ? generateClickableText(dataToRender.stackTrace) : ""
             });
-            if (cause) {
+            if (cause && dataToRender === exception) {
               const causeText = stringifyStack({
                 name: getErrorName(cause),
                 message: cause.reason ? generateClickableText(cause.reason) : cause.stack ? generateClickableText(cause.stack) : ""
@@ -1237,6 +1238,9 @@ window.__supervisor__ = (() => {
     });
   };
   const getErrorName = value => {
+    if (value.code === "MODULE_NOT_FOUND") {
+      return "TypeError";
+    }
     const {
       constructor
     } = value;

diff --git a/packages/internal/plugin-supervisor/package.json b/packages/internal/plugin-supervisor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-supervisor",
-  "version": "1.5.23",
+  "version": "1.5.24",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/internal/plugin-supervisor/src/client/supervisor.js b/packages/internal/plugin-supervisor/src/client/supervisor.js
@@ -707,19 +707,19 @@ window.__supervisor__ = (() => {
     };
 
     const stringifyStack = ({ codeFrame, name, message, stackTrace }) => {
-      let stack = "";
+      const parts = [];
       if (codeFrame) {
-        stack += `${codeFrame}\n`;
+        parts.push(codeFrame);
       }
       if (name && message) {
-        stack += `${name}: ${message}`;
+        parts.push(`${name}: ${message}`);
       } else if (message) {
-        stack += message;
+        parts.push(message);
       }
       if (stackTrace) {
-        stack += `\n${stackTrace}`;
+        parts.push(stackTrace);
       }
-      return stack;
+      return parts.join("\n");
     };
 
     const stringifyUrlSite = ({ url, line, column }) => {
@@ -971,20 +971,24 @@ window.__supervisor__ = (() => {
           const renderException = () => {
             const { cause = {} } = exception;
             const { trace = {} } = cause;
-
+            const dataToRender =
+              cause.code === "MODULE_NOT_FOUND" ? cause : exception;
             root.querySelector(".text").innerHTML = stringifyStack({
               codeFrame: trace.codeFrame
                 ? generateClickableText(trace.codeFrame)
                 : "",
-              name: exception.name,
-              message: exception.message
-                ? generateClickableText(exception.message)
-                : "",
-              stackTrace: exception.stackTrace
-                ? generateClickableText(exception.stackTrace)
+              name: dataToRender.name,
+              message:
+                cause.code === "MODULE_NOT_FOUND"
+                  ? generateClickableText(dataToRender.reason)
+                  : dataToRender.message
+                    ? generateClickableText(dataToRender.message)
+                    : "",
+              stackTrace: dataToRender.stackTrace
+                ? generateClickableText(dataToRender.stackTrace)
                 : "",
             });
-            if (cause) {
+            if (cause && dataToRender === exception) {
               const causeText = stringifyStack({
                 name: getErrorName(cause),
                 message: cause.reason
@@ -1329,6 +1333,9 @@ window.__supervisor__ = (() => {
   };
 
   const getErrorName = (value) => {
+    if (value.code === "MODULE_NOT_FOUND") {
+      return "TypeError";
+    }
     const { constructor } = value;
     if (constructor) {
       if (constructor.name !== "Object") {

diff --git a/packages/related/cli/package.json b/packages/related/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/cli",
-  "version": "0.1.60",
+  "version": "0.1.62",
   "description": "Command Line Interface for jsenv",
   "license": "MIT",
   "repository": {

diff --git a/packages/related/cli/template-node-package/package.json b/packages/related/cli/template-node-package/package.json
@@ -11,10 +11,10 @@
     "test:coverage": "npm run test -- --coverage"
   },
   "devDependencies": {
-    "@jsenv/assert": "4.4.1",
-    "@jsenv/core": "39.5.17",
+    "@jsenv/assert": "4.4.2",
+    "@jsenv/core": "39.5.18",
     "@jsenv/eslint-config-relax": "1.2.12",
-    "@jsenv/test": "3.5.20",
+    "@jsenv/test": "3.5.21",
     "eslint": "9.14.0",
     "prettier": "3.3.3"
   }

diff --git a/packages/related/cli/template-web-components/package.json b/packages/related/cli/template-web-components/package.json
@@ -17,12 +17,12 @@
   "devDependencies": {
     "@babel/plugin-syntax-import-assertions": "7.26.0",
     "@jsenv/custom-elements-redefine": "0.0.1",
-    "@jsenv/assert": "4.4.1",
-    "@jsenv/core": "39.5.17",
+    "@jsenv/assert": "4.4.2",
+    "@jsenv/core": "39.5.18",
     "@jsenv/plugin-bundling": "2.7.16",
     "@jsenv/plugin-minification": "1.5.10",
     "@jsenv/eslint-config-relax": "1.2.12",
-    "@jsenv/test": "3.5.20",
+    "@jsenv/test": "3.5.21",
     "eslint": "9.14.0",
     "open": "10.1.0",
     "@playwright/browser-chromium": "1.48.2",