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

package/dist/index.mjs

@@ -1501,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
@@ -1511,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 });
@@ -1620,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,
@@ -1633,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

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-25-1788281970041/dist/index.mjs
+// packages/@cjser/jsdoc-type-pratt-parser.tmp-27-1789662903248/dist/index.mjs
 var index_exports = {};
 __export(index_exports, {
   catharsisTransform: () => catharsisTransform,
@@ -1447,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 });
@@ -1501,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 !== "") {
@@ -1566,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,
@@ -1579,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjser/jsdoc-type-pratt-parser",
-  "version": "9.2.1-cjser.2",
+  "version": "9.2.2-cjser.2",
   "description": "",
   "type": "module",
   "types": "./dist/index.d.mts",
@@ -64,7 +64,7 @@
     "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",
@@ -120,11 +120,11 @@
   },
   "main": "./dist-cjser/index.cjs",
   "cjser": {
-    "sourceVersion": "9.2.1",
+    "sourceVersion": "9.2.2",
     "cjserVersion": 2,
     "original": {
       "name": "jsdoc-type-pratt-parser",
-      "version": "9.2.1",
+      "version": "9.2.2",
       "exports": {
         ".": "./dist/index.mjs",
         "./package.json": "./package.json"