@dereekb/util 13.12.1 → 13.12.2

package/eslint/index.cjs.js

@@ -2986,19 +2986,28 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
     });
 }
 /**
- * Returns the index of the first line that begins with a JSDoc `@tag`, or `-1` when none exists.
+ * Computes, per line, whether it sits inside a fenced code block (a ```` ``` ```` block, typically
+ * an `@example` body) and therefore must not be treated as a tag boundary. Fence delimiter lines
+ * themselves are flagged too. Without this, `@`-prefixed lines inside a fence — decorators like
+ * `@Global()` / `@Module()`, or JSDoc snippets — would be mis-parsed as standalone JSDoc tags.
  *
  * @param lines - Parsed lines in source order.
- * @returns Zero-based line index of the first tag, or `-1` when no tag is present.
- */ function findFirstTagIndex(lines) {
-    var firstTagIndex = -1;
+ * @returns Boolean mask where `true` marks a line that must not start a tag.
+ */ function computeFenceMask(lines) {
+    var mask = lines.map(function() {
+        return false;
+    });
+    var fenceOpen = false;
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = lines.entries()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var _step_value = _sliced_to_array$7(_step.value, 2), i = _step_value[0], line = _step_value[1];
-            if (TAG_LINE_REGEX$1.test(line.text)) {
-                firstTagIndex = i;
-                break;
+            var isDelimiter = line.text.trimStart().startsWith('```');
+            if (isDelimiter) {
+                mask[i] = true;
+                fenceOpen = !fenceOpen;
+            } else {
+                mask[i] = fenceOpen;
             }
         }
     } catch (err) {
@@ -3015,6 +3024,32 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
             }
         }
     }
+    return mask;
+}
+/**
+ * Returns true when the line at `index` opens a JSDoc tag and is not masked out by a code fence.
+ *
+ * @param lines - Parsed lines in source order.
+ * @param fenceMask - Mask from {@link computeFenceMask} marking fenced lines.
+ * @param index - Line index to test.
+ * @returns True when the line begins a tag that should be treated as a tag boundary.
+ */ function isTagStart(lines, fenceMask, index) {
+    return !fenceMask[index] && TAG_LINE_REGEX$1.test(lines[index].text);
+}
+/**
+ * Returns the index of the first line that begins with a JSDoc `@tag`, or `-1` when none exists.
+ *
+ * @param lines - Parsed lines in source order.
+ * @param fenceMask - Mask from {@link computeFenceMask} marking fenced lines.
+ * @returns Zero-based line index of the first tag, or `-1` when no tag is present.
+ */ function findFirstTagIndex(lines, fenceMask) {
+    var firstTagIndex = -1;
+    for(var i = 0; i < lines.length; i += 1){
+        if (isTagStart(lines, fenceMask, i)) {
+            firstTagIndex = i;
+            break;
+        }
+    }
     return firstTagIndex;
 }
 /**
@@ -3112,15 +3147,16 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
  * Collects the tag line at `startIndex` plus every following non-tag continuation line.
  *
  * @param lines - All parsed lines in the comment.
+ * @param fenceMask - Mask from {@link computeFenceMask} marking fenced lines.
  * @param startIndex - Index of the `@tag` opening line.
  * @returns The collected tag lines and the index of the next unconsumed line.
- */ function collectTagLines(lines, startIndex) {
+ */ function collectTagLines(lines, fenceMask, startIndex) {
     var tagLines = [
         lines[startIndex]
     ];
     var j = startIndex + 1;
     while(j < lines.length){
-        if (TAG_LINE_REGEX$1.test(lines[j].text)) break;
+        if (isTagStart(lines, fenceMask, j)) break;
         tagLines.push(lines[j]);
         j += 1;
     }
@@ -3151,15 +3187,16 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
  * Builds a single parsed-tag record starting at `startIndex` in the line array.
  *
  * @param lines - All parsed lines in the comment.
+ * @param fenceMask - Mask from {@link computeFenceMask} marking fenced lines.
  * @param startIndex - Index of the `@tag` opening line.
  * @returns The parsed tag and the next unconsumed line index.
- */ function parseTagAt(lines, startIndex) {
+ */ function parseTagAt(lines, fenceMask, startIndex) {
     var line = lines[startIndex];
     var match = TAG_LINE_REGEX$1.exec(line.text);
     var tagName = match[1];
     var _extractTypeAnnotation = extractTypeAnnotation(match[2]), type = _extractTypeAnnotation.type, afterType = _extractTypeAnnotation.rest;
     var _extractParamName = extractParamName$1(tagName, afterType), name = _extractParamName.name, afterName = _extractParamName.rest;
-    var _collectTagLines = collectTagLines(lines, startIndex), tagLines = _collectTagLines.tagLines, nextIndex = _collectTagLines.nextIndex;
+    var _collectTagLines = collectTagLines(lines, fenceMask, startIndex), tagLines = _collectTagLines.tagLines, nextIndex = _collectTagLines.nextIndex;
     var description = buildTagDescription(afterName, tagLines);
     return {
         tag: {
@@ -3178,18 +3215,19 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
  * Parses every `@tag` block starting from `firstTagIndex` to the end of the line array.
  *
  * @param lines - All parsed lines in the comment.
+ * @param fenceMask - Mask from {@link computeFenceMask} marking fenced lines.
  * @param firstTagIndex - Index where tag parsing should begin (`-1` skips entirely).
  * @returns All parsed tags in source order.
- */ function parseTags(lines, firstTagIndex) {
+ */ function parseTags(lines, fenceMask, firstTagIndex) {
     var tags = [];
     if (firstTagIndex !== -1) {
         var i = firstTagIndex;
         while(i < lines.length){
-            if (!TAG_LINE_REGEX$1.test(lines[i].text)) {
+            if (!isTagStart(lines, fenceMask, i)) {
                 i += 1;
                 continue;
             }
-            var _parseTagAt = parseTagAt(lines, i), tag = _parseTagAt.tag, nextIndex = _parseTagAt.nextIndex;
+            var _parseTagAt = parseTagAt(lines, fenceMask, i), tag = _parseTagAt.tag, nextIndex = _parseTagAt.nextIndex;
             tags.push(tag);
             i = nextIndex;
         }
@@ -3213,14 +3251,15 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
  */ function parseJsdocComment(commentValue) {
     var singleLine = !commentValue.includes('\n');
     var lines = buildParsedLines(commentValue);
-    var firstTagIndex = findFirstTagIndex(lines);
+    var fenceMask = computeFenceMask(lines);
+    var firstTagIndex = findFirstTagIndex(lines, fenceMask);
     var descriptionLines = firstTagIndex === -1 ? lines.slice() : lines.slice(0, firstTagIndex);
     var trimmedDescription = trimBlankBoundaries(descriptionLines);
     var description = trimmedDescription.map(function(l) {
         return l.text;
     }).join('\n');
     var descriptionParagraphs = buildDescriptionParagraphs(trimmedDescription);
-    var tags = parseTags(lines, firstTagIndex);
+    var tags = parseTags(lines, fenceMask, firstTagIndex);
     return {
         lines: lines,
         descriptionLines: descriptionLines,

package/eslint/index.esm.js

@@ -2984,19 +2984,28 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
     });
 }
 /**
- * Returns the index of the first line that begins with a JSDoc `@tag`, or `-1` when none exists.
+ * Computes, per line, whether it sits inside a fenced code block (a ```` ``` ```` block, typically
+ * an `@example` body) and therefore must not be treated as a tag boundary. Fence delimiter lines
+ * themselves are flagged too. Without this, `@`-prefixed lines inside a fence — decorators like
+ * `@Global()` / `@Module()`, or JSDoc snippets — would be mis-parsed as standalone JSDoc tags.
  *
  * @param lines - Parsed lines in source order.
- * @returns Zero-based line index of the first tag, or `-1` when no tag is present.
- */ function findFirstTagIndex(lines) {
-    var firstTagIndex = -1;
+ * @returns Boolean mask where `true` marks a line that must not start a tag.
+ */ function computeFenceMask(lines) {
+    var mask = lines.map(function() {
+        return false;
+    });
+    var fenceOpen = false;
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = lines.entries()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var _step_value = _sliced_to_array$7(_step.value, 2), i = _step_value[0], line = _step_value[1];
-            if (TAG_LINE_REGEX$1.test(line.text)) {
-                firstTagIndex = i;
-                break;
+            var isDelimiter = line.text.trimStart().startsWith('```');
+            if (isDelimiter) {
+                mask[i] = true;
+                fenceOpen = !fenceOpen;
+            } else {
+                mask[i] = fenceOpen;
             }
         }
     } catch (err) {
@@ -3013,6 +3022,32 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
             }
         }
     }
+    return mask;
+}
+/**
+ * Returns true when the line at `index` opens a JSDoc tag and is not masked out by a code fence.
+ *
+ * @param lines - Parsed lines in source order.
+ * @param fenceMask - Mask from {@link computeFenceMask} marking fenced lines.
+ * @param index - Line index to test.
+ * @returns True when the line begins a tag that should be treated as a tag boundary.
+ */ function isTagStart(lines, fenceMask, index) {
+    return !fenceMask[index] && TAG_LINE_REGEX$1.test(lines[index].text);
+}
+/**
+ * Returns the index of the first line that begins with a JSDoc `@tag`, or `-1` when none exists.
+ *
+ * @param lines - Parsed lines in source order.
+ * @param fenceMask - Mask from {@link computeFenceMask} marking fenced lines.
+ * @returns Zero-based line index of the first tag, or `-1` when no tag is present.
+ */ function findFirstTagIndex(lines, fenceMask) {
+    var firstTagIndex = -1;
+    for(var i = 0; i < lines.length; i += 1){
+        if (isTagStart(lines, fenceMask, i)) {
+            firstTagIndex = i;
+            break;
+        }
+    }
     return firstTagIndex;
 }
 /**
@@ -3110,15 +3145,16 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
  * Collects the tag line at `startIndex` plus every following non-tag continuation line.
  *
  * @param lines - All parsed lines in the comment.
+ * @param fenceMask - Mask from {@link computeFenceMask} marking fenced lines.
  * @param startIndex - Index of the `@tag` opening line.
  * @returns The collected tag lines and the index of the next unconsumed line.
- */ function collectTagLines(lines, startIndex) {
+ */ function collectTagLines(lines, fenceMask, startIndex) {
     var tagLines = [
         lines[startIndex]
     ];
     var j = startIndex + 1;
     while(j < lines.length){
-        if (TAG_LINE_REGEX$1.test(lines[j].text)) break;
+        if (isTagStart(lines, fenceMask, j)) break;
         tagLines.push(lines[j]);
         j += 1;
     }
@@ -3149,15 +3185,16 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
  * Builds a single parsed-tag record starting at `startIndex` in the line array.
  *
  * @param lines - All parsed lines in the comment.
+ * @param fenceMask - Mask from {@link computeFenceMask} marking fenced lines.
  * @param startIndex - Index of the `@tag` opening line.
  * @returns The parsed tag and the next unconsumed line index.
- */ function parseTagAt(lines, startIndex) {
+ */ function parseTagAt(lines, fenceMask, startIndex) {
     var line = lines[startIndex];
     var match = TAG_LINE_REGEX$1.exec(line.text);
     var tagName = match[1];
     var _extractTypeAnnotation = extractTypeAnnotation(match[2]), type = _extractTypeAnnotation.type, afterType = _extractTypeAnnotation.rest;
     var _extractParamName = extractParamName$1(tagName, afterType), name = _extractParamName.name, afterName = _extractParamName.rest;
-    var _collectTagLines = collectTagLines(lines, startIndex), tagLines = _collectTagLines.tagLines, nextIndex = _collectTagLines.nextIndex;
+    var _collectTagLines = collectTagLines(lines, fenceMask, startIndex), tagLines = _collectTagLines.tagLines, nextIndex = _collectTagLines.nextIndex;
     var description = buildTagDescription(afterName, tagLines);
     return {
         tag: {
@@ -3176,18 +3213,19 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
  * Parses every `@tag` block starting from `firstTagIndex` to the end of the line array.
  *
  * @param lines - All parsed lines in the comment.
+ * @param fenceMask - Mask from {@link computeFenceMask} marking fenced lines.
  * @param firstTagIndex - Index where tag parsing should begin (`-1` skips entirely).
  * @returns All parsed tags in source order.
- */ function parseTags(lines, firstTagIndex) {
+ */ function parseTags(lines, fenceMask, firstTagIndex) {
     var tags = [];
     if (firstTagIndex !== -1) {
         var i = firstTagIndex;
         while(i < lines.length){
-            if (!TAG_LINE_REGEX$1.test(lines[i].text)) {
+            if (!isTagStart(lines, fenceMask, i)) {
                 i += 1;
                 continue;
             }
-            var _parseTagAt = parseTagAt(lines, i), tag = _parseTagAt.tag, nextIndex = _parseTagAt.nextIndex;
+            var _parseTagAt = parseTagAt(lines, fenceMask, i), tag = _parseTagAt.tag, nextIndex = _parseTagAt.nextIndex;
             tags.push(tag);
             i = nextIndex;
         }
@@ -3211,14 +3249,15 @@ var LINE_PREFIX_REGEX = /^(\s*\*?\s?)(.*)$/;
  */ function parseJsdocComment(commentValue) {
     var singleLine = !commentValue.includes('\n');
     var lines = buildParsedLines(commentValue);
-    var firstTagIndex = findFirstTagIndex(lines);
+    var fenceMask = computeFenceMask(lines);
+    var firstTagIndex = findFirstTagIndex(lines, fenceMask);
     var descriptionLines = firstTagIndex === -1 ? lines.slice() : lines.slice(0, firstTagIndex);
     var trimmedDescription = trimBlankBoundaries(descriptionLines);
     var description = trimmedDescription.map(function(l) {
         return l.text;
     }).join('\n');
     var descriptionParagraphs = buildDescriptionParagraphs(trimmedDescription);
-    var tags = parseTags(lines, firstTagIndex);
+    var tags = parseTags(lines, fenceMask, firstTagIndex);
     return {
         lines: lines,
         descriptionLines: descriptionLines,

package/eslint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/util/eslint",
-  "version": "13.12.1",
+  "version": "13.12.2",
   "peerDependencies": {
     "@typescript-eslint/utils": "8.59.3"
   },

package/fetch/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@dereekb/util/fetch",
-  "version": "13.12.1",
+  "version": "13.12.2",
   "peerDependencies": {
-    "@dereekb/util": "13.12.1",
+    "@dereekb/util": "13.12.2",
     "make-error": "^1.3.6",
     "fast-content-type-parse": "^3.0.0"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/util",
-  "version": "13.12.1",
+  "version": "13.12.2",
   "sideEffects": false,
   "exports": {
     "./test": {

package/src/lib/string/mimetype.d.ts

@@ -44,15 +44,15 @@ export type ImageFileExtension = 'jpeg' | 'jpg' | 'png' | 'webp' | 'gif' | 'svg'
 /**
  * MIME type for JPEG images.
  */
-export declare const JPEG_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const JPEG_MIME_TYPE = "image/jpeg";
 /**
  * Non-canonical MIME type sometimes emitted by older browsers/clients for JPEG images.
  */
-export declare const JPG_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const JPG_MIME_TYPE = "image/jpg";
 /**
  * Progressive JPEG MIME type emitted by some legacy clients (notably Internet Explorer).
  */
-export declare const PJPEG_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const PJPEG_MIME_TYPE = "image/pjpeg";
 /**
  * All MIME type variants that should be treated as JPEG images, including the canonical
  * `image/jpeg` and the non-standard `image/jpg` and `image/pjpeg` variants emitted by
@@ -62,31 +62,31 @@ export declare const JPEG_MIME_TYPES: readonly MimeTypeWithoutParameters[];
 /**
  * MIME type for PNG images.
  */
-export declare const PNG_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const PNG_MIME_TYPE = "image/png";
 /**
  * MIME type for WebP images.
  */
-export declare const WEBP_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const WEBP_MIME_TYPE = "image/webp";
 /**
  * MIME type for GIF images.
  */
-export declare const GIF_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const GIF_MIME_TYPE = "image/gif";
 /**
  * MIME type for HEIF images.
  */
-export declare const HEIF_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const HEIF_MIME_TYPE = "image/heif";
 /**
  * MIME type for TIFF images.
  */
-export declare const TIFF_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const TIFF_MIME_TYPE = "image/tiff";
 /**
  * MIME type for SVG images.
  */
-export declare const SVG_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const SVG_MIME_TYPE = "image/svg+xml";
 /**
  * MIME type for RAW images.
  */
-export declare const RAW_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const RAW_MIME_TYPE = "image/raw";
 /**
  * Maps image file extensions to their corresponding MIME types.
  */
@@ -118,43 +118,43 @@ export type DocumentFileExtension = 'pdf' | 'docx' | 'xlsx' | 'txt' | 'csv' | 'h
 /**
  * MIME type for PDF documents.
  */
-export declare const PDF_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const PDF_MIME_TYPE = "application/pdf";
 /**
  * MIME type for DOCX (Word) documents.
  */
-export declare const DOCX_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const DOCX_MIME_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
 /**
  * MIME type for XLSX (Excel) spreadsheets.
  */
-export declare const XLSX_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const XLSX_MIME_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
 /**
  * MIME type for plain text files.
  */
-export declare const TXT_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const TXT_MIME_TYPE = "text/plain";
 /**
  * MIME type for CSV files.
  */
-export declare const CSV_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const CSV_MIME_TYPE = "text/csv";
 /**
  * MIME type for HTML files.
  */
-export declare const HTML_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const HTML_MIME_TYPE = "text/html";
 /**
  * MIME type for XML files.
  */
-export declare const XML_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const XML_MIME_TYPE = "application/xml";
 /**
  * MIME type for JSON files.
  */
-export declare const JSON_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const JSON_MIME_TYPE = "application/json";
 /**
  * MIME type for YAML files.
  */
-export declare const YAML_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const YAML_MIME_TYPE = "application/yaml";
 /**
  * MIME type for Markdown files.
  */
-export declare const MARKDOWN_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const MARKDOWN_MIME_TYPE = "text/markdown";
 /**
  * Maps document file extensions to their corresponding MIME types.
  */
@@ -186,7 +186,7 @@ export type ApplicationFileExtension = 'zip';
 /**
  * MIME type for ZIP archive files.
  */
-export declare const ZIP_FILE_MIME_TYPE: MimeTypeWithoutParameters;
+export declare const ZIP_FILE_MIME_TYPE = "application/zip";
 /**
  * Maps application file extensions to their corresponding MIME types.
  */

package/test/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@dereekb/util/test",
-  "version": "13.12.1",
+  "version": "13.12.2",
   "peerDependencies": {
-    "@dereekb/util": "13.12.1",
+    "@dereekb/util": "13.12.2",
     "make-error": "^1.3.6"
   },
   "exports": {