@gi-tcg/gts-transpiler 0.4.2 → 0.4.3

package/dist/index.js

@@ -203,7 +203,7 @@ function gtsPlugin(options = {}) {
 					dummy.isDummy = true;
 					return this.finishNode(dummy, "Identifier");
 				}
-				return this.parseExprAtom();
+				return this.parseExprSubscripts(void 0, false);
 			}
 			gts_parseShortcutFunction() {
 				const node = this.startNode();
@@ -1563,7 +1563,7 @@ const gtsToTypingsWalker = {
 				};
 				state.literalFromIdentifier.add(lit);
 				return lit;
-			} else return { ...visit(attr) };
+			} else return visit(attr);
 		});
 		const returnValue = {
 			type: "Identifier",
@@ -1976,7 +1976,8 @@ const DEFAULT_GTS_CONFIG = {
 		"anemo",
 		"geo",
 		"dendro",
-		"omni"
+		"omni",
+		"$"
 	],
 	queryBindings: ["my", "opp"]
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gi-tcg/gts-transpiler",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/piovium/gts.git"

package/src/config.ts

@@ -42,6 +42,7 @@ const DEFAULT_GTS_CONFIG: Required<GtsConfig> = {
     "geo",
     "dendro",
     "omni",
+    "$",
   ],
   queryBindings: ["my", "opp"],
 };

package/src/parse/gts_plugin.ts

@@ -1,4 +1,4 @@
-import { tokTypes, type Parser as ParserClass } from "acorn";
+import { tokTypes, type Parser as ParserClass, type Node } from "acorn";
 import type { Parse, AST } from "../types.ts";
 import { specialIdentifiers } from "../keywords.ts";
 import { DUMMY_PLACEHOLDER } from "./loose_plugin.ts";
@@ -46,7 +46,8 @@ AttributeExpression:
     # foo bar { baz = 1 };
     # foo bar, { baz: 1 };   // If allowed, hard to distinguish
     # foo bar, ({ baz: 1 }); // OK
-    [lookahead != "{"] PrimaryExpression
+    [lookahead != "{"] CallExpression OptionalChain?
+    [lookahead != "{"] MemberExpression OptionalChain?
 
 DirectShortcutFunction:
     [lookahead = one of ":", ReservedWord]
@@ -260,7 +261,7 @@ export function gtsPlugin(options: GtsPluginOption = {}) {
           dummy.isDummy = true;
           return this.finishNode(dummy, "Identifier");
         }
-        return this.parseExprAtom();
+        return this.parseExprSubscripts(void 0, false);
       }
 
       gts_parseShortcutFunction() {

package/src/transform/volar/walker.ts

@@ -389,7 +389,7 @@ export const gtsToTypingsWalker: Visitors<Node, TypingTranspileState> = {
           state.literalFromIdentifier.add(lit);
           return lit;
         } else {
-          return { ...(visit(attr) as Expression) };
+          return visit(attr) as Expression;
         }
       },
     );