@cjser/jsdoc-type-pratt-parser 9.1.2-cjser.2 → 9.2.2-cjser.2

package/dist/index.d.mts

@@ -486,11 +486,12 @@ declare function parse(expression: string, mode: ParseMode, { range, rangeStart,
  * @param expression
  * @param modes
  */
-declare function tryParse(expression: string, modes?: ParseMode[], { module, strictMode, asyncFunctionBody, classContext, range, rangeStart, loc, locStart }?: {
+declare function tryParse(expression: string, modes?: ParseMode[], { module, strictMode, asyncFunctionBody, classContext, computedPropertyParser, range, rangeStart, loc, locStart }?: {
   module?: boolean;
   strictMode?: boolean;
   asyncFunctionBody?: boolean;
   classContext?: boolean;
+  computedPropertyParser?: (text: string, options?: any) => unknown;
   range?: boolean;
   rangeStart?: number;
   loc?: boolean;

package/dist/index.mjs

@@ -897,11 +897,13 @@ function createObjectParslet({ signatureGrammar, objectFieldGrammar, allowKeyTyp
 					if (parser.lexer.current.startOfLine) {
 						separator ??= "linebreak";
 						parser.consume(",") || parser.consume(";");
-					} else if (parser.consume(",")) if (parser.lexer.current.startOfLine) separator = "comma-and-linebreak";
-					else separator = "comma";
-					else if (parser.consume(";")) if (parser.lexer.current.startOfLine) separator = "semicolon-and-linebreak";
-					else separator = "semicolon";
-					else break;
+					} else if (parser.consume(",")) {
+						if (parser.lexer.current.startOfLine) separator = "comma-and-linebreak";
+						else separator = "comma";
+					} else if (parser.consume(";")) {
+						if (parser.lexer.current.startOfLine) separator = "semicolon-and-linebreak";
+						else separator = "semicolon";
+					} else break;
 					if (parser.lexer.current.type === "}") break;
 				}
 				result.meta.separator = separator ?? "comma";
@@ -1282,9 +1284,10 @@ function createTupleParslet({ allowQuestionMark }) {
 			};
 			if (parser.consume("]")) return result;
 			const typeList = parser.parseIntermediateType(0);
-			if (typeList.type === "JsdocTypeParameterList") if (typeList.elements[0].type === "JsdocTypeKeyValue") result.elements = typeList.elements.map(assertPlainKeyValueResult);
-			else result.elements = typeList.elements.map(assertRootResult);
-			else if (typeList.type === "JsdocTypeKeyValue") result.elements = [assertPlainKeyValueResult(typeList)];
+			if (typeList.type === "JsdocTypeParameterList") {
+				if (typeList.elements[0].type === "JsdocTypeKeyValue") result.elements = typeList.elements.map(assertPlainKeyValueResult);
+				else result.elements = typeList.elements.map(assertRootResult);
+			} else if (typeList.type === "JsdocTypeKeyValue") result.elements = [assertPlainKeyValueResult(typeList)];
 			else result.elements = [assertRootResult(typeList)];
 			if (!parser.consume("]")) throw new Error("Unterminated '['");
 			if (!allowQuestionMark && result.elements.some((e) => e.type === "JsdocTypeUnknown")) throw new Error("Question mark in tuple not allowed");
@@ -1313,9 +1316,8 @@ const inferParslet = composeParslet({
 	parsePrefix: (parser) => {
 		parser.consume("infer");
 		const element = parser.parseIntermediateType(12);
-		if (element.type !== "JsdocTypeName")
- /* c8 ignore next 2 -- c8 does not mark the exercised throw as covered */
-		throw new UnexpectedTypeError(element, "A typescript infer always has to have a name.");
+		/* c8 ignore next 3 -- c8 does not mark the exercised throw as covered */
+		if (element.type !== "JsdocTypeName") throw new UnexpectedTypeError(element, "A typescript infer always has to have a name.");
 		return {
 			type: "JsdocTypeInfer",
 			element
@@ -1499,6 +1501,9 @@ var Lexer = class Lexer {
 		const next = Lexer.read(this.lexerRules, this.text);
 		return new Lexer(this.lexerRules, next.text, this.current, this.next, next.token);
 	}
+	clone() {
+		return new Lexer(this.lexerRules, this.text, this.previous, this.current, this.next);
+	}
 };
 //#endregion
 //#region src/parslets/ObjectSquaredPropertyParslet.ts
@@ -1509,7 +1514,15 @@ const objectSquaredPropertyParslet = composeParslet({
 		if (parser.baseParser === void 0) throw new Error("Only allowed inside object grammar");
 		parser.consume("[");
 		let innerBracketType;
-		if (parser.externalParsers?.computedPropertyParser === void 0) try {
+		let isIndexSignatureOrMappedType = false;
+		if (parser.externalParsers?.computedPropertyParser !== void 0) try {
+			const tryLexer = parser.lexer.clone();
+			const tryParser = new Parser(parser.grammar, tryLexer, parser.baseParser, { externalParsers: parser.externalParsers });
+			const parsedType = tryParser.parseIntermediateType(2);
+			const isMapped = parsedType?.type === "JsdocTypeName" && tryParser.consume("in");
+			if (parsedType?.type === "JsdocTypeObjectField" && typeof parsedType.key === "string" && !parsedType.optional && !parsedType.readonly && parsedType.right !== void 0 || isMapped) isIndexSignatureOrMappedType = true;
+		} catch (err) {}
+		if (isIndexSignatureOrMappedType || parser.externalParsers?.computedPropertyParser === void 0) try {
 			innerBracketType = parser.parseIntermediateType(2);
 		} catch (err) {
 			throw new Error("Error parsing value inside square bracketed property.", { cause: err });
@@ -1618,7 +1631,10 @@ const objectSquaredPropertyParslet = composeParslet({
 				type = "JsdocTypeComputedMethod";
 				checkMiddle();
 				parser.consume(":");
-				const nextValue = parser.parseType(4);
+				const parentParser = parser.baseParser;
+				parentParser.acceptLexerState(parser);
+				const nextValue = parentParser.parseType(4);
+				parser.acceptLexerState(parentParser);
 				key = {
 					type,
 					optional,
@@ -1631,7 +1647,10 @@ const objectSquaredPropertyParslet = composeParslet({
 				type = "JsdocTypeComputedProperty";
 				checkMiddle();
 				if (!parser.consume(":")) throw new Error("Incomplete computed property: missing colon");
-				right = parser.parseType(4);
+				const parentParser = parser.baseParser;
+				parentParser.acceptLexerState(parser);
+				right = parentParser.parseType(4);
+				parser.acceptLexerState(parentParser);
 				key = {
 					type,
 					value: innerBracketType
@@ -2089,19 +2108,17 @@ function parse(expression, mode, { range = false, rangeStart, loc = false, locSt
 				locStart
 			});
 			break;
-		case "typescript":
-			parser = new Parser(typescriptGrammar, Lexer.create(rules, expression), void 0, {
-				module,
-				strictMode,
-				asyncFunctionBody,
-				classContext,
-				range,
-				rangeStart,
-				loc,
-				locStart,
-				externalParsers: { computedPropertyParser }
-			});
-			break;
+		case "typescript": parser = new Parser(typescriptGrammar, Lexer.create(rules, expression), void 0, {
+			module,
+			strictMode,
+			asyncFunctionBody,
+			classContext,
+			range,
+			rangeStart,
+			loc,
+			locStart,
+			externalParsers: { computedPropertyParser }
+		});
 	}
 	const result = parser.parse();
 	return assertResultIsNotReservedWord(parser, result);
@@ -2117,7 +2134,7 @@ function tryParse(expression, modes = [
 	"typescript",
 	"closure",
 	"jsdoc"
-], { module = true, strictMode = true, asyncFunctionBody = true, classContext = false, range, rangeStart, loc = false, locStart = {
+], { module = true, strictMode = true, asyncFunctionBody = true, classContext = false, computedPropertyParser, range, rangeStart, loc = false, locStart = {
 	column: 0,
 	line: 1
 } } = {}) {
@@ -2128,6 +2145,7 @@ function tryParse(expression, modes = [
 			strictMode,
 			asyncFunctionBody,
 			classContext,
+			computedPropertyParser,
 			range,
 			rangeStart,
 			loc,
@@ -2174,10 +2192,11 @@ function notAvailableTransform(parseResult) {
 }
 function extractSpecialParams(source) {
 	const result = { params: [] };
-	for (const param of source.parameters) if (param.type === "JsdocTypeKeyValue") if (param.key === "this") result.this = param.right;
-	else if (param.key === "new") result.new = param.right;
-	else result.params.push(param);
-	else result.params.push(param);
+	for (const param of source.parameters) if (param.type === "JsdocTypeKeyValue") {
+		if (param.key === "this") result.this = param.right;
+		else if (param.key === "new") result.new = param.right;
+		else result.params.push(param);
+	} else result.params.push(param);
 	return result;
 }
 //#endregion
@@ -2275,7 +2294,9 @@ function stringifyRules({ computedPropertyStringifier } = {}) {
 			const separatorForSingleObjectField = result.meta.separatorForSingleObjectField ?? false;
 			const trailingPunctuation = result.meta.trailingPunctuation ?? false;
 			const bracketSpacing = result.meta.bracketSpacing ?? "";
-			return `{${(lbType && (separatorForSingleObjectField || result.elements.length > 1) ? `\n${result.meta.propertyIndent ?? ""}` : bracketSpacing) + result.elements.map(transform).join(result.meta.separator === "comma" ? ", " : lbType ? lbEnding + (result.meta.propertyIndent ?? "") : "; ") + (separatorForSingleObjectField && result.elements.length === 1 ? result.meta.separator === "comma" ? "," : lbType ? lbEnding : ";" : trailingPunctuation && result.meta.separator !== void 0 ? result.meta.separator.startsWith("comma") ? "," : result.meta.separator.startsWith("semicolon") ? ";" : "" : "") + (lbType && result.elements.length > 1 ? "\n" : bracketSpacing)}}`;
+			return `{${
+			/* c8 ignore next -- Guard */
+			(lbType && (separatorForSingleObjectField || result.elements.length > 1) ? `\n${result.meta.propertyIndent ?? ""}` : bracketSpacing) + result.elements.map(transform).join(result.meta.separator === "comma" ? ", " : lbType ? lbEnding + (result.meta.propertyIndent ?? "") : "; ") + (separatorForSingleObjectField && result.elements.length === 1 ? result.meta.separator === "comma" ? "," : lbType ? lbEnding : ";" : trailingPunctuation && result.meta.separator !== void 0 ? result.meta.separator.startsWith("comma") ? "," : result.meta.separator.startsWith("semicolon") ? ";" : "" : "") + (lbType && result.elements.length > 1 ? "\n" : bracketSpacing)}}`;
 		},
 		JsdocTypeOptional: (result, transform) => applyPosition(result.meta.position, transform(result.element), "="),
 		JsdocTypeSymbol: (result, transform) => `${result.value}(${result.element !== void 0 ? transform(result.element) : ""})`,

package/dist-cjser/index.cjs

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/@cjser/jsdoc-type-pratt-parser.tmp-26-1787070930446/dist/index.mjs
+// packages/@cjser/jsdoc-type-pratt-parser.tmp-27-1789662903248/dist/index.mjs
 var index_exports = {};
 __export(index_exports, {
   catharsisTransform: () => catharsisTransform,
@@ -880,11 +880,13 @@ function createObjectParslet({ signatureGrammar, objectFieldGrammar: objectField
           if (parser.lexer.current.startOfLine) {
             separator ??= "linebreak";
             parser.consume(",") || parser.consume(";");
-          } else if (parser.consume(",")) if (parser.lexer.current.startOfLine) separator = "comma-and-linebreak";
-          else separator = "comma";
-          else if (parser.consume(";")) if (parser.lexer.current.startOfLine) separator = "semicolon-and-linebreak";
-          else separator = "semicolon";
-          else break;
+          } else if (parser.consume(",")) {
+            if (parser.lexer.current.startOfLine) separator = "comma-and-linebreak";
+            else separator = "comma";
+          } else if (parser.consume(";")) {
+            if (parser.lexer.current.startOfLine) separator = "semicolon-and-linebreak";
+            else separator = "semicolon";
+          } else break;
           if (parser.lexer.current.type === "}") break;
         }
         result.meta.separator = separator ?? "comma";
@@ -1246,9 +1248,10 @@ function createTupleParslet({ allowQuestionMark }) {
       };
       if (parser.consume("]")) return result;
       const typeList = parser.parseIntermediateType(0);
-      if (typeList.type === "JsdocTypeParameterList") if (typeList.elements[0].type === "JsdocTypeKeyValue") result.elements = typeList.elements.map(assertPlainKeyValueResult);
-      else result.elements = typeList.elements.map(assertRootResult);
-      else if (typeList.type === "JsdocTypeKeyValue") result.elements = [assertPlainKeyValueResult(typeList)];
+      if (typeList.type === "JsdocTypeParameterList") {
+        if (typeList.elements[0].type === "JsdocTypeKeyValue") result.elements = typeList.elements.map(assertPlainKeyValueResult);
+        else result.elements = typeList.elements.map(assertRootResult);
+      } else if (typeList.type === "JsdocTypeKeyValue") result.elements = [assertPlainKeyValueResult(typeList)];
       else result.elements = [assertRootResult(typeList)];
       if (!parser.consume("]")) throw new Error("Unterminated '['");
       if (!allowQuestionMark && result.elements.some((e) => e.type === "JsdocTypeUnknown")) throw new Error("Question mark in tuple not allowed");
@@ -1273,8 +1276,7 @@ var inferParslet = composeParslet({
   parsePrefix: (parser) => {
     parser.consume("infer");
     const element = parser.parseIntermediateType(12);
-    if (element.type !== "JsdocTypeName")
-      throw new UnexpectedTypeError(element, "A typescript infer always has to have a name.");
+    if (element.type !== "JsdocTypeName") throw new UnexpectedTypeError(element, "A typescript infer always has to have a name.");
     return {
       type: "JsdocTypeInfer",
       element
@@ -1445,16 +1447,28 @@ var Lexer = class Lexer2 {
     const next = Lexer2.read(this.lexerRules, this.text);
     return new Lexer2(this.lexerRules, next.text, this.current, this.next, next.token);
   }
+  clone() {
+    return new Lexer2(this.lexerRules, this.text, this.previous, this.current, this.next);
+  }
 };
 var objectSquaredPropertyParslet = composeParslet({
   name: "objectSquarePropertyParslet",
   accept: (type) => type === "[",
   parsePrefix: (parser) => {
-    var _a, _b;
+    var _a, _b, _c;
     if (parser.baseParser === void 0) throw new Error("Only allowed inside object grammar");
     parser.consume("[");
     let innerBracketType;
-    if (((_a = parser.externalParsers) == null ? void 0 : _a.computedPropertyParser) === void 0) try {
+    let isIndexSignatureOrMappedType = false;
+    if (((_a = parser.externalParsers) == null ? void 0 : _a.computedPropertyParser) !== void 0) try {
+      const tryLexer = parser.lexer.clone();
+      const tryParser = new Parser(parser.grammar, tryLexer, parser.baseParser, { externalParsers: parser.externalParsers });
+      const parsedType = tryParser.parseIntermediateType(2);
+      const isMapped = (parsedType == null ? void 0 : parsedType.type) === "JsdocTypeName" && tryParser.consume("in");
+      if ((parsedType == null ? void 0 : parsedType.type) === "JsdocTypeObjectField" && typeof parsedType.key === "string" && !parsedType.optional && !parsedType.readonly && parsedType.right !== void 0 || isMapped) isIndexSignatureOrMappedType = true;
+    } catch (err) {
+    }
+    if (isIndexSignatureOrMappedType || ((_b = parser.externalParsers) == null ? void 0 : _b.computedPropertyParser) === void 0) try {
       innerBracketType = parser.parseIntermediateType(2);
     } catch (err) {
       throw new Error("Error parsing value inside square bracketed property.", { cause: err });
@@ -1499,7 +1513,7 @@ var objectSquaredPropertyParslet = composeParslet({
       };
       parser.acceptLexerState(parentParser);
     } else {
-      if (((_b = parser.externalParsers) == null ? void 0 : _b.computedPropertyParser) !== void 0) {
+      if (((_c = parser.externalParsers) == null ? void 0 : _c.computedPropertyParser) !== void 0) {
         let remaining = parser.lexer.current.text + parser.lexer.remaining();
         let checkingText = remaining;
         while (checkingText !== "") {
@@ -1564,7 +1578,10 @@ var objectSquaredPropertyParslet = composeParslet({
         type = "JsdocTypeComputedMethod";
         checkMiddle();
         parser.consume(":");
-        const nextValue = parser.parseType(4);
+        const parentParser = parser.baseParser;
+        parentParser.acceptLexerState(parser);
+        const nextValue = parentParser.parseType(4);
+        parser.acceptLexerState(parentParser);
         key = {
           type,
           optional,
@@ -1577,7 +1594,10 @@ var objectSquaredPropertyParslet = composeParslet({
         type = "JsdocTypeComputedProperty";
         checkMiddle();
         if (!parser.consume(":")) throw new Error("Incomplete computed property: missing colon");
-        right = parser.parseType(4);
+        const parentParser = parser.baseParser;
+        parentParser.acceptLexerState(parser);
+        right = parentParser.parseType(4);
+        parser.acceptLexerState(parentParser);
         key = {
           type,
           value: innerBracketType
@@ -2022,7 +2042,6 @@ function parse(expression, mode, { range = false, rangeStart, loc = false, locSt
         locStart,
         externalParsers: { computedPropertyParser }
       });
-      break;
   }
   const result = parser.parse();
   return assertResultIsNotReservedWord(parser, result);
@@ -2031,7 +2050,7 @@ function tryParse(expression, modes = [
   "typescript",
   "closure",
   "jsdoc"
-], { module: module2 = true, strictMode = true, asyncFunctionBody = true, classContext = false, range, rangeStart, loc = false, locStart = {
+], { module: module2 = true, strictMode = true, asyncFunctionBody = true, classContext = false, computedPropertyParser, range, rangeStart, loc = false, locStart = {
   column: 0,
   line: 1
 } } = {}) {
@@ -2042,6 +2061,7 @@ function tryParse(expression, modes = [
       strictMode,
       asyncFunctionBody,
       classContext,
+      computedPropertyParser,
       range,
       rangeStart,
       loc,
@@ -2082,10 +2102,11 @@ function notAvailableTransform(parseResult) {
 }
 function extractSpecialParams(source) {
   const result = { params: [] };
-  for (const param of source.parameters) if (param.type === "JsdocTypeKeyValue") if (param.key === "this") result.this = param.right;
-  else if (param.key === "new") result.new = param.right;
-  else result.params.push(param);
-  else result.params.push(param);
+  for (const param of source.parameters) if (param.type === "JsdocTypeKeyValue") {
+    if (param.key === "this") result.this = param.right;
+    else if (param.key === "new") result.new = param.right;
+    else result.params.push(param);
+  } else result.params.push(param);
   return result;
 }
 function applyPosition(position, target, value) {
@@ -2192,7 +2213,8 @@ function stringifyRules({ computedPropertyStringifier } = {}) {
       const separatorForSingleObjectField = result.meta.separatorForSingleObjectField ?? false;
       const trailingPunctuation = result.meta.trailingPunctuation ?? false;
       const bracketSpacing = result.meta.bracketSpacing ?? "";
-      return `{${(lbType && (separatorForSingleObjectField || result.elements.length > 1) ? `
+      return `{${/* c8 ignore next -- Guard */
+      (lbType && (separatorForSingleObjectField || result.elements.length > 1) ? `
 ${result.meta.propertyIndent ?? ""}` : bracketSpacing) + result.elements.map(transform2).join(result.meta.separator === "comma" ? ", " : lbType ? lbEnding + (result.meta.propertyIndent ?? "") : "; ") + (separatorForSingleObjectField && result.elements.length === 1 ? result.meta.separator === "comma" ? "," : lbType ? lbEnding : ";" : trailingPunctuation && result.meta.separator !== void 0 ? result.meta.separator.startsWith("comma") ? "," : result.meta.separator.startsWith("semicolon") ? ";" : "" : "") + (lbType && result.elements.length > 1 ? "\n" : bracketSpacing)}}`;
     },
     JsdocTypeOptional: (result, transform2) => applyPosition(result.meta.position, transform2(result.element), "="),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjser/jsdoc-type-pratt-parser",
-  "version": "9.1.2-cjser.2",
+  "version": "9.2.2-cjser.2",
   "description": "",
   "type": "module",
   "types": "./dist/index.d.mts",
@@ -15,12 +15,13 @@
     "test": "test"
   },
   "scripts": {
-    "test": "npm run typecheck && npm run lint && npm run test:spec",
+    "test": "npm run tsc && npm run lint && npm run test:spec",
     "test:spec": "mocha",
     "test:coverage": "c8 --all npm run test:spec",
     "test:coveralls": "c8 report --reporter=lcov && coveralls",
     "lint": "eslint .",
-    "typecheck": "tsc --noEmit",
+    "tsc": "tsc --noEmit",
+    "tsc:ts7": "npx -y -p typescript@^7 -c \"tsc\"",
     "attw": "attw --pack . --profile esm-only",
     "build": "tsdown && npm run attw",
     "apidoc": "typedoc --options typedoc.json",
@@ -38,7 +39,8 @@
     "node": "^22.22.2 || >=24.15.0"
   },
   "dependencies": {
-    "@types/estree": "^1.0.9"
+    "@types/estree": "^1.0.9",
+    "@types/node": "^26.4.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.5",
@@ -47,7 +49,6 @@
     "@semantic-release/git": "^11.0.1",
     "@types/chai": "^5.2.3",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^26.2.0",
     "@types/sinon": "^22.0.0",
     "@types/sinon-chai": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "^8.42.0",
@@ -57,13 +58,13 @@
     "chai": "^6.2.2",
     "coveralls": "^3.1.1",
     "eslint": "^9.39.4",
-    "eslint-config-love": "154.1.0",
+    "eslint-config-love": "155.0.0",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-n": "^18.3.0",
     "eslint-plugin-promise": "^7.3.0",
     "espree": "^11.2.0",
     "jsdoctypeparser": "^9.0.0",
-    "mocha": "^11.8.0",
+    "mocha": "^12.0.0",
     "npm-upgrade": "^3.3.0",
     "patch-package": "^8.0.1",
     "semantic-release": "^25.0.9",
@@ -119,11 +120,11 @@
   },
   "main": "./dist-cjser/index.cjs",
   "cjser": {
-    "sourceVersion": "9.1.2",
+    "sourceVersion": "9.2.2",
     "cjserVersion": 2,
     "original": {
       "name": "jsdoc-type-pratt-parser",
-      "version": "9.1.2",
+      "version": "9.2.2",
       "exports": {
         ".": "./dist/index.mjs",
         "./package.json": "./package.json"
@@ -133,18 +134,20 @@
         "url": "https://github.com/jsdoc-type-pratt-parser/jsdoc-type-pratt-parser.git"
       },
       "dependencies": {
-        "@types/estree": "^1.0.9"
+        "@types/estree": "^1.0.9",
+        "@types/node": "^26.4.0"
       },
       "files": [
         "dist/**/*"
       ],
       "scripts": {
-        "test": "npm run typecheck && npm run lint && npm run test:spec",
+        "test": "npm run tsc && npm run lint && npm run test:spec",
         "test:spec": "mocha",
         "test:coverage": "c8 --all npm run test:spec",
         "test:coveralls": "c8 report --reporter=lcov && coveralls",
         "lint": "eslint .",
-        "typecheck": "tsc --noEmit",
+        "tsc": "tsc --noEmit",
+        "tsc:ts7": "npx -y -p typescript@^7 -c \"tsc\"",
         "attw": "attw --pack . --profile esm-only",
         "build": "tsdown && npm run attw",
         "apidoc": "typedoc --options typedoc.json",