Reorganize the modules.

test/private/CliError.test.mjs → CliError.test.mjs

@@ -1,6 +1,6 @@
 import { strictEqual, throws } from "assert";
 
-import CliError from "../../private/CliError.mjs";
+import CliError from "./CliError.mjs";
 
 export default (tests) => {
   tests.add("`CliError` with argument 1 `message` not a string.", () => {

test/private/CodeLocation.test.mjs → CodeLocation.test.mjs

@@ -1,7 +1,7 @@
 import { deepStrictEqual, throws } from "assert";
 
-import CodeLocation from "../../private/CodeLocation.mjs";
-import CodePosition from "../../private/CodePosition.mjs";
+import CodeLocation from "./CodeLocation.mjs";
+import CodePosition from "./CodePosition.mjs";
 
 export default (tests) => {
   tests.add(

test/private/CodePosition.test.mjs → CodePosition.test.mjs

@@ -1,6 +1,6 @@
 import { deepStrictEqual, throws } from "assert";
 
-import CodePosition from "../../private/CodePosition.mjs";
+import CodePosition from "./CodePosition.mjs";
 
 export default (tests) => {
   tests.add("`CodePosition` with argument 1 `line` not a number.", () => {

test/private/InvalidJsdocError.test.mjs → InvalidJsdocError.test.mjs

@@ -3,10 +3,10 @@ import kleur from "kleur";
 import revertableGlobals from "revertable-globals";
 import snapshot from "snapshot-assertion";
 
-import CliError from "../../private/CliError.mjs";
-import CodeLocation from "../../private/CodeLocation.mjs";
-import CodePosition from "../../private/CodePosition.mjs";
-import InvalidJsdocError from "../../private/InvalidJsdocError.mjs";
+import CliError from "./CliError.mjs";
+import CodeLocation from "./CodeLocation.mjs";
+import CodePosition from "./CodePosition.mjs";
+import InvalidJsdocError from "./InvalidJsdocError.mjs";
 
 export default (tests) => {
   tests.add(
@@ -89,7 +89,7 @@ export default (tests) => {
       await snapshot(
         error.message,
         new URL(
-          "../snapshots/InvalidJsdocError/code-location-end-position-none.ans",
+          "./test/snapshots/InvalidJsdocError/code-location-end-position-none.ans",
           import.meta.url
         )
       );
@@ -127,7 +127,7 @@ export default (tests) => {
       await snapshot(
         error.message,
         new URL(
-          "../snapshots/InvalidJsdocError/code-location-end-position-matching-start.ans",
+          "./test/snapshots/InvalidJsdocError/code-location-end-position-matching-start.ans",
           import.meta.url
         )
       );
@@ -165,7 +165,7 @@ export default (tests) => {
       await snapshot(
         error.message,
         new URL(
-          "../snapshots/InvalidJsdocError/code-location-end-position-beyond-start.ans",
+          "./test/snapshots/InvalidJsdocError/code-location-end-position-beyond-start.ans",
           import.meta.url
         )
       );

changelog.md

@@ -7,13 +7,16 @@
 - Updated Node.js support to `^12.22.0 || ^14.17.0 || >= 16.0.0`.
 - Updated dependencies, some of which require newer Node.js versions than previously supported.
 - Removed `./package` from the package `exports` field; the full `package.json` filename must be used in a `require` path.
+- Public modules are now individually listed in the package `files` and `exports` fields.
+- Shortened public module deep import paths, removing the `/public/`.
 
 ### Patch
 
 - Also run GitHub Actions CI with Node.js v17.
 - Simplified dev dependencies and config for ESLint.
 - Simplified package scripts.
 - Use a new [`replace-stack-traces`](https://npm.im/replace-stack-traces) dev dependency in tests.
+- Reorganized the test file structure.
 - Configured Prettier option `singleQuote` to the default, `false`.
 - Added a `license.md` MIT License file.
 - Improved documentation.

test/private/codePositionToIndex.test.mjs → codePositionToIndex.test.mjs

@@ -1,7 +1,7 @@
 import { strictEqual, throws } from "assert";
 
-import CodePosition from "../../private/CodePosition.mjs";
-import codePositionToIndex from "../../private/codePositionToIndex.mjs";
+import CodePosition from "./CodePosition.mjs";
+import codePositionToIndex from "./codePositionToIndex.mjs";
 
 export default (tests) => {
   tests.add(

test/private/codeToJsdocComments.test.mjs → codeToJsdocComments.test.mjs

@@ -1,7 +1,7 @@
 import { deepStrictEqual, rejects } from "assert";
 import snapshot from "snapshot-assertion";
 
-import codeToJsdocComments from "../../private/codeToJsdocComments.mjs";
+import codeToJsdocComments from "./codeToJsdocComments.mjs";
 
 const TEST_CODE_FILE_PATH = "/a.js";
 
@@ -85,7 +85,7 @@ let a;`,
           2
         ),
         new URL(
-          "../snapshots/codeToJsdocComments/single-comment-block-single-line-jsdoc.json",
+          "./test/snapshots/codeToJsdocComments/single-comment-block-single-line-jsdoc.json",
           import.meta.url
         )
       );
@@ -124,7 +124,7 @@ let a;`,
           2
         ),
         new URL(
-          "../snapshots/codeToJsdocComments/single-comment-block-multi-line-jsdoc.json",
+          "./test/snapshots/codeToJsdocComments/single-comment-block-multi-line-jsdoc.json",
           import.meta.url
         )
       );
@@ -152,7 +152,7 @@ let b;`,
           2
         ),
         new URL(
-          "../snapshots/codeToJsdocComments/multiple-comment-blocks-multi-line-jsdoc.json",
+          "./test/snapshots/codeToJsdocComments/multiple-comment-blocks-multi-line-jsdoc.json",
           import.meta.url
         )
       );

test/private/deconstructJsdocNamepath.test.mjs → deconstructJsdocNamepath.test.mjs

@@ -1,6 +1,6 @@
 import { deepStrictEqual, throws } from "assert";
 
-import deconstructJsdocNamepath from "../../private/deconstructJsdocNamepath.mjs";
+import deconstructJsdocNamepath from "./deconstructJsdocNamepath.mjs";
 
 export default (tests) => {
   tests.add(

test/private/getJsdocBlockDescriptionSource.test.mjs → getJsdocBlockDescriptionSource.test.mjs

@@ -2,8 +2,8 @@ import { deepStrictEqual, throws } from "assert";
 import { parse } from "comment-parser";
 import snapshot from "snapshot-assertion";
 
-import COMMENT_PARSER_OPTIONS from "../../private/COMMENT_PARSER_OPTIONS.mjs";
-import getJsdocBlockDescriptionSource from "../../private/getJsdocBlockDescriptionSource.mjs";
+import COMMENT_PARSER_OPTIONS from "./COMMENT_PARSER_OPTIONS.mjs";
+import getJsdocBlockDescriptionSource from "./getJsdocBlockDescriptionSource.mjs";
 
 export default (tests) => {
   tests.add(
@@ -44,7 +44,7 @@ export default (tests) => {
       await snapshot(
         JSON.stringify(getJsdocBlockDescriptionSource(jsdocBlock), null, 2),
         new URL(
-          "../snapshots/getJsdocBlockDescriptionSource/description-no-tags.json",
+          "./test/snapshots/getJsdocBlockDescriptionSource/description-no-tags.json",
           import.meta.url
         )
       );
@@ -70,7 +70,7 @@ export default (tests) => {
       await snapshot(
         JSON.stringify(getJsdocBlockDescriptionSource(jsdocBlock), null, 2),
         new URL(
-          "../snapshots/getJsdocBlockDescriptionSource/description-tags.json",
+          "./test/snapshots/getJsdocBlockDescriptionSource/description-tags.json",
           import.meta.url
         )
       );

test/private/getJsdocSourceTokenCodeLocation.test.mjs → getJsdocSourceTokenCodeLocation.test.mjs

@@ -1,10 +1,10 @@
 import { deepStrictEqual, throws } from "assert";
 import { parse } from "comment-parser";
 
-import CodeLocation from "../../private/CodeLocation.mjs";
-import CodePosition from "../../private/CodePosition.mjs";
-import COMMENT_PARSER_OPTIONS from "../../private/COMMENT_PARSER_OPTIONS.mjs";
-import getJsdocSourceTokenCodeLocation from "../../private/getJsdocSourceTokenCodeLocation.mjs";
+import CodeLocation from "./CodeLocation.mjs";
+import CodePosition from "./CodePosition.mjs";
+import COMMENT_PARSER_OPTIONS from "./COMMENT_PARSER_OPTIONS.mjs";
+import getJsdocSourceTokenCodeLocation from "./getJsdocSourceTokenCodeLocation.mjs";
 
 export default (tests) => {
   tests.add(

cli/jsdoc-md.mjs → jsdoc-md.mjs

@@ -2,9 +2,9 @@
 
 import arg from "arg";
 
-import CliError from "../private/CliError.mjs";
-import reportCliError from "../private/reportCliError.mjs";
-import jsdocMd from "../public/jsdocMd.mjs";
+import CliError from "./CliError.mjs";
+import jsdocMd from "./jsdocMd.mjs";
+import reportCliError from "./reportCliError.mjs";
 
 /**
  * Runs the `jsdoc-md` CLI.

test/cli/jsdoc-md.test.mjs → jsdoc-md.test.mjs

@@ -7,7 +7,7 @@ import snapshot from "snapshot-assertion";
 import { fileURLToPath } from "url";
 
 const JSDOC_MD_CLI_PATH = fileURLToPath(
-  new URL("../../cli/jsdoc-md.mjs", import.meta.url)
+  new URL("./jsdoc-md.mjs", import.meta.url)
 );
 
 export default (tests) => {
@@ -34,7 +34,7 @@ export default (tests) => {
         await snapshot(
           stderr.toString(),
           new URL(
-            "../snapshots/jsdoc-md/argument-source-glob-value-empty-stderr.ans",
+            "./test/snapshots/jsdoc-md/argument-source-glob-value-empty-stderr.ans",
             import.meta.url
           )
         );
@@ -67,7 +67,7 @@ export default (tests) => {
         await snapshot(
           stderr.toString(),
           new URL(
-            "../snapshots/jsdoc-md/argument-source-glob-value-missing-stderr.ans",
+            "./test/snapshots/jsdoc-md/argument-source-glob-value-missing-stderr.ans",
             import.meta.url
           )
         );
@@ -98,7 +98,7 @@ export default (tests) => {
       await snapshot(
         stderr.toString(),
         new URL(
-          "../snapshots/jsdoc-md/argument-s-value-missing-stderr.ans",
+          "./test/snapshots/jsdoc-md/argument-s-value-missing-stderr.ans",
           import.meta.url
         )
       );
@@ -130,7 +130,7 @@ export default (tests) => {
         await snapshot(
           stderr.toString(),
           new URL(
-            "../snapshots/jsdoc-md/argument-s-value-missing-following-short-arg-stderr.ans",
+            "./test/snapshots/jsdoc-md/argument-s-value-missing-following-short-arg-stderr.ans",
             import.meta.url
           )
         );
@@ -163,7 +163,7 @@ export default (tests) => {
         await snapshot(
           stderr.toString(),
           new URL(
-            "../snapshots/jsdoc-md/argument-markdown-path-value-empty-stderr.ans",
+            "./test/snapshots/jsdoc-md/argument-markdown-path-value-empty-stderr.ans",
             import.meta.url
           )
         );
@@ -196,7 +196,7 @@ export default (tests) => {
         await snapshot(
           stderr.toString(),
           new URL(
-            "../snapshots/jsdoc-md/argument-markdown-path-value-missing-stderr.ans",
+            "./test/snapshots/jsdoc-md/argument-markdown-path-value-missing-stderr.ans",
             import.meta.url
           )
         );
@@ -227,7 +227,7 @@ export default (tests) => {
       await snapshot(
         stderr.toString(),
         new URL(
-          "../snapshots/jsdoc-md/argument-m-value-missing-stderr.ans",
+          "./test/snapshots/jsdoc-md/argument-m-value-missing-stderr.ans",
           import.meta.url
         )
       );
@@ -259,7 +259,7 @@ export default (tests) => {
         await snapshot(
           stderr.toString(),
           new URL(
-            "../snapshots/jsdoc-md/argument-m-value-missing-following-short-arg-stderr.ans",
+            "./test/snapshots/jsdoc-md/argument-m-value-missing-following-short-arg-stderr.ans",
             import.meta.url
           )
         );
@@ -292,7 +292,7 @@ export default (tests) => {
         await snapshot(
           stderr.toString(),
           new URL(
-            "../snapshots/jsdoc-md/argument-target-heading-value-empty-stderr.ans",
+            "./test/snapshots/jsdoc-md/argument-target-heading-value-empty-stderr.ans",
             import.meta.url
           )
         );
@@ -325,7 +325,7 @@ export default (tests) => {
         await snapshot(
           stderr.toString(),
           new URL(
-            "../snapshots/jsdoc-md/argument-target-heading-value-missing-stderr.ans",
+            "./test/snapshots/jsdoc-md/argument-target-heading-value-missing-stderr.ans",
             import.meta.url
           )
         );
@@ -356,7 +356,7 @@ export default (tests) => {
       await snapshot(
         stderr.toString(),
         new URL(
-          "../snapshots/jsdoc-md/argument-t-value-missing-stderr.ans",
+          "./test/snapshots/jsdoc-md/argument-t-value-missing-stderr.ans",
           import.meta.url
         )
       );
@@ -388,7 +388,7 @@ export default (tests) => {
         await snapshot(
           stderr.toString(),
           new URL(
-            "../snapshots/jsdoc-md/argument-t-value-missing-following-short-arg-stderr.ans",
+            "./test/snapshots/jsdoc-md/argument-t-value-missing-following-short-arg-stderr.ans",
             import.meta.url
           )
         );
@@ -419,7 +419,7 @@ export default (tests) => {
       await snapshot(
         stderr.toString(),
         new URL(
-          "../snapshots/jsdoc-md/unexpected-argument-stderr.ans",
+          "./test/snapshots/jsdoc-md/unexpected-argument-stderr.ans",
           import.meta.url
         )
       );
@@ -454,7 +454,7 @@ export default (tests) => {
       await snapshot(
         stderr.toString(),
         new URL(
-          "../snapshots/jsdoc-md/unexpected-arguments-stderr.ans",
+          "./test/snapshots/jsdoc-md/unexpected-arguments-stderr.ans",
           import.meta.url
         )
       );
@@ -544,7 +544,7 @@ export default 1;
 
       await snapshot(
         await fs.promises.readFile(pathMd, "utf8"),
-        new URL("../snapshots/jsdoc-md/defaults.md", import.meta.url)
+        new URL("./test/snapshots/jsdoc-md/defaults.md", import.meta.url)
       );
     });
   });
@@ -617,7 +617,7 @@ export default 1;
 
       await snapshot(
         await fs.promises.readFile(pathMd, "utf8"),
-        new URL("../snapshots/jsdoc-md/arguments.md", import.meta.url)
+        new URL("./test/snapshots/jsdoc-md/arguments.md", import.meta.url)
       );
     });
   });
@@ -665,7 +665,7 @@ export default 1;
       await snapshot(
         spawnResult1.stderr.toString(),
         new URL(
-          "../snapshots/jsdoc-md/argument-check-error-stderr.ans",
+          "./test/snapshots/jsdoc-md/argument-check-error-stderr.ans",
           import.meta.url
         )
       );
@@ -746,7 +746,7 @@ export default 1;
       await snapshot(
         stderr.toString(),
         new URL(
-          "../snapshots/jsdoc-md/invalid-jsdoc-error-stderr.ans",
+          "./test/snapshots/jsdoc-md/invalid-jsdoc-error-stderr.ans",
           import.meta.url
         )
       );