@cjser/es-joy__jsdoccomment 1.0.0-cjser.2 → 1.2.0-cjser.2

package/CHANGES.md

@@ -1,5 +1,17 @@
 # CHANGES for `@es-joy/jsdoccomment`
 
+## 1.2.0
+
+- perf: skip token search in `getFollowingComment` when no comment can follow (@christopher-buss)
+- chore: update typescript-eslint/types, devDeps
+- ci: check Node 26 but drop macos and reduce windows test to one
+- ci: drop Node 20.19.0 from the test matrix (@morgan-coded)
+- ci: check TypeScript in a separate job (@morgan-coded)
+
+## 1.1.0
+
+- chore: update types/estree, typescript-eslint/types, jsdoc-type-pratt-parser, devDeps.
+
 ## 1.0.0
 
 - chore: update jsdoc-type-pratt-parser, devDep.

package/dist-cjser/index.cjs

@@ -27,7 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/@cjser/es-joy__jsdoccomment.tmp-26-1792686817497/src/index.js
+// packages/@cjser/es-joy__jsdoccomment.tmp-24-1794505098034/src/index.js
 var index_exports = {};
 __export(index_exports, {
   commentHandler: () => commentHandler,
@@ -52,11 +52,11 @@ module.exports = __toCommonJS(index_exports);
 var import_jsdoc_type_pratt_parser4 = require("@cjser/jsdoc-type-pratt-parser");
 __reExport(index_exports, require("@cjser/jsdoc-type-pratt-parser"), module.exports);
 
-// packages/@cjser/es-joy__jsdoccomment.tmp-26-1792686817497/src/commentHandler.js
+// packages/@cjser/es-joy__jsdoccomment.tmp-24-1794505098034/src/commentHandler.js
 var import_esquery = __toESM(require("esquery"), 1);
 var import_jsdoc_type_pratt_parser2 = require("@cjser/jsdoc-type-pratt-parser");
 
-// packages/@cjser/es-joy__jsdoccomment.tmp-26-1792686817497/src/commentParserToESTree.js
+// packages/@cjser/es-joy__jsdoccomment.tmp-24-1794505098034/src/commentParserToESTree.js
 var import_jsdoc_type_pratt_parser = require("@cjser/jsdoc-type-pratt-parser");
 var stripEncapsulatingBrackets = (container, isArr) => {
   if (isArr) {
@@ -343,7 +343,7 @@ var jsdocVisitorKeys = {
   JsdocInlineTag: []
 };
 
-// packages/@cjser/es-joy__jsdoccomment.tmp-26-1792686817497/src/commentHandler.js
+// packages/@cjser/es-joy__jsdoccomment.tmp-24-1794505098034/src/commentHandler.js
 var commentHandler = (settings, commentParserToESTreeOptions) => {
   return (commentSelector, jsdoc) => {
     const { mode } = settings;
@@ -372,10 +372,10 @@ var commentHandler = (settings, commentParserToESTreeOptions) => {
   };
 };
 
-// packages/@cjser/es-joy__jsdoccomment.tmp-26-1792686817497/src/estreeToString.js
+// packages/@cjser/es-joy__jsdoccomment.tmp-24-1794505098034/src/estreeToString.js
 var import_jsdoc_type_pratt_parser3 = require("@cjser/jsdoc-type-pratt-parser");
 
-// packages/@cjser/es-joy__jsdoccomment.tmp-26-1792686817497/src/inlineTagEscapes.js
+// packages/@cjser/es-joy__jsdoccomment.tmp-24-1794505098034/src/inlineTagEscapes.js
 function getLabelDelimiter(format) {
   return format === "prefix" ? "]" : "}";
 }
@@ -419,7 +419,7 @@ function encodeInlineTagText(text, format) {
   return encoded;
 }
 
-// packages/@cjser/es-joy__jsdoccomment.tmp-26-1792686817497/src/estreeToString.js
+// packages/@cjser/es-joy__jsdoccomment.tmp-24-1794505098034/src/estreeToString.js
 var stringifiers = {
   /* eslint-enable jsdoc/reject-function-type -- Different functions */
   JsdocBlock,
@@ -575,7 +575,7 @@ function JsdocTag(node, opts) {
   return result;
 }
 
-// packages/@cjser/es-joy__jsdoccomment.tmp-26-1792686817497/src/jsdoccomment.js
+// packages/@cjser/es-joy__jsdoccomment.tmp-24-1794505098034/src/jsdoccomment.js
 var isCommentToken = (token) => {
   return ["Line", "Block", "Shebang"].includes(token.type);
 };
@@ -954,6 +954,13 @@ var getFollowingComment = function(sourceCode, astNodeInput) {
     return tokenAfter2;
   };
   const tokenAfterIgnoringSemis = (node) => {
+    if (node.loc) {
+      const { end } = node.loc;
+      const line = sourceCode.lines[end.line - 1];
+      if (!line.includes("/", end.column) && !line.includes("<", end.column)) {
+        return null;
+      }
+    }
     const tokenAfter2 = getTokensAfterIgnoringSemis(node);
     return tokenAfter2 && isCommentToken(tokenAfter2) && compareLocEndToStart(node, tokenAfter2) ? tokenAfter2 : null;
   };
@@ -980,10 +987,10 @@ var getFollowingComment = function(sourceCode, astNodeInput) {
   return tokenAfter;
 };
 
-// packages/@cjser/es-joy__jsdoccomment.tmp-26-1792686817497/src/parseComment.js
+// packages/@cjser/es-joy__jsdoccomment.tmp-24-1794505098034/src/parseComment.js
 var import_comment_parser = require("comment-parser");
 
-// packages/@cjser/es-joy__jsdoccomment.tmp-26-1792686817497/src/parseInlineTags.js
+// packages/@cjser/es-joy__jsdoccomment.tmp-24-1794505098034/src/parseInlineTags.js
 function determineFormat(match) {
   const { separator, text } = match.groups;
   const [, textEnd] = match.indices.groups.text;
@@ -1057,7 +1064,7 @@ function parseInlineTags(block) {
   );
 }
 
-// packages/@cjser/es-joy__jsdoccomment.tmp-26-1792686817497/src/parseComment.js
+// packages/@cjser/es-joy__jsdoccomment.tmp-24-1794505098034/src/parseComment.js
 var {
   name: nameTokenizer,
   tag: tagTokenizer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjser/es-joy__jsdoccomment",
-  "version": "1.0.0-cjser.2",
+  "version": "1.2.0-cjser.2",
   "author": "Brett Zamir <brettz9@yahoo.com>",
   "contributors": [],
   "description": "Maintained replacement for ESLint's deprecated SourceCode#getJSDocComment along with other jsdoc utilities",
@@ -44,34 +44,34 @@
     "node": "^22.22.2 || >=24.15.0"
   },
   "dependencies": {
-    "@types/estree": "^1.0.9",
-    "@typescript-eslint/types": "^8.72.0",
+    "@types/estree": "^1.0.10",
+    "@typescript-eslint/types": "^8.72.2",
     "comment-parser": "1.4.9",
     "esquery": "^1.7.0",
-    "@cjser/jsdoc-type-pratt-parser": "9.4.0-cjser.2"
+    "@cjser/jsdoc-type-pratt-parser": "9.5.0-cjser.2"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.5",
-    "@es-joy/escodegen": "^4.2.0",
+    "@es-joy/escodegen": "^5.0.1",
     "@node-static/node-static": "^0.10.0",
     "@types/esquery": "^1.5.4",
     "@types/estraverse": "^5.1.7",
-    "@typescript-eslint/visitor-keys": "^8.72.0",
+    "@typescript-eslint/visitor-keys": "^8.72.2",
     "@typhonjs-build-test/esm-d-ts": "0.4.0",
     "@typhonjs-typedoc/typedoc-pkg": "^0.4.2",
-    "@vitest/coverage-v8": "^5.0.5",
-    "@vitest/ui": "^5.0.5",
+    "@vitest/coverage-v8": "^5.1.0",
+    "@vitest/ui": "^5.1.0",
     "@webcoder49/code-input": "^2.9.0",
-    "eslint": "^10.13.0",
+    "eslint": "^10.14.0",
     "eslint-config-ash-nazg": "43.2.4",
-    "eslint-plugin-jsdoc": "^65.4.0",
+    "eslint-plugin-jsdoc": "^65.4.5",
     "espree": "^11.2.0",
     "estraverse": "^5.3.0",
     "prismjs": "^1.30.0",
     "typedoc": "^0.28.20",
     "typescript": "6.0.3",
-    "typescript-eslint": "^8.72.0",
-    "vitest": "^5.0.5"
+    "typescript-eslint": "^8.72.2",
+    "vitest": "^5.1.0"
   },
   "files": [
     "/dist",
@@ -98,11 +98,11 @@
   },
   "main": "./dist-cjser/index.cjs",
   "cjser": {
-    "sourceVersion": "1.0.0",
+    "sourceVersion": "1.2.0",
     "cjserVersion": 2,
     "original": {
       "name": "@es-joy/jsdoccomment",
-      "version": "1.0.0",
+      "version": "1.2.0",
       "exports": {
         ".": {
           "types": "./dist/index.d.ts",
@@ -114,11 +114,11 @@
         "url": "git+https://github.com/es-joy/jsdoccomment.git"
       },
       "dependencies": {
-        "@types/estree": "^1.0.9",
-        "@typescript-eslint/types": "^8.72.0",
+        "@types/estree": "^1.0.10",
+        "@typescript-eslint/types": "^8.72.2",
         "comment-parser": "1.4.9",
         "esquery": "^1.7.0",
-        "jsdoc-type-pratt-parser": "~9.4.0"
+        "jsdoc-type-pratt-parser": "~9.5.0"
       },
       "files": [
         "/dist",

package/src/jsdoccomment.js

@@ -683,6 +683,19 @@ const getFollowingComment = function (sourceCode, astNodeInput) {
    *   AST node to get the comment for.
    */
   const tokenAfterIgnoringSemis = (node) => {
+    // Skip the token search if the rest of the line has no comment start
+    //   (`//`, `/*` or `<!--`)
+    if (node.loc) {
+      const {end} = node.loc;
+      const line = sourceCode.lines[end.line - 1];
+      if (
+        !line.includes('/', end.column) &&
+        !line.includes('<', end.column)
+      ) {
+        return null;
+      }
+    }
+
     const tokenAfter = getTokensAfterIgnoringSemis(node);
     return (
       tokenAfter &&