@gi-tcg/gts-transpiler 0.4.6 → 0.6.0

package/dist/index.d.ts

@@ -517,8 +517,6 @@ declare function parseLoose(input: string, options?: ParseLooseOptions): Program
 interface TranspileOption {
   runtimeImportSource?: string;
   providerImportSource?: string;
-  shortcutFunctionPreludes?: string[];
-  queryBindings?: string[];
 }
 //#endregion
 //#region ../../node_modules/@volar/source-map/lib/sourceMap.d.ts

package/dist/index.js

@@ -61,8 +61,7 @@ const specialIdentifiers = [
 	"of",
 	"set",
 	"type",
-	"define",
-	"query"
+	"define"
 ];
 function loosePlugin() {
 	return function loosePluginTransformer(parser) {
@@ -238,21 +237,6 @@ function gtsPlugin(options = {}) {
 				}
 				return super.parseExprAtom(refDestructuringErrors, forInit, forNew);
 			}
-			parseMaybeUnary(refDestructuringErrors, sawUnary, incDec, forInit) {
-				if (this.isShortcutContext && this.isContextual("query")) {
-					const expr = this.gts_parseQueryExpression();
-					if (!incDec && this.eat(tokTypes.starstar)) this.unexpected(this.lastTokStart);
-					return expr;
-				}
-				return super.parseMaybeUnary(refDestructuringErrors, sawUnary, incDec, forInit);
-			}
-			gts_parseQueryExpression(forInit) {
-				const node = this.startNode();
-				this.next();
-				if (this.eat(tokTypes.star)) node.star = true;
-				node.argument = this.parseMaybeUnary(null, true, false, forInit);
-				return this.finishNode(node, "GTSQueryExpression");
-			}
 		};
 	};
 }
@@ -712,14 +696,6 @@ const eraseTs = (ast) => {
 	return walk(ast, null, eraseTsVisitor);
 };
 //#endregion
-//#region src/transform/constants.ts
-const DEFAULT_SHORTCUT_FUNCTION_PRELUDES = ["$"];
-const DEFAULT_QUERY_BINDINGS = [
-	"my",
-	"opp",
-	"macros"
-];
-//#endregion
 //#region src/transform/gts.ts
 const commonGtsVisitor = {
 	GTSDirectFunction(node, { visit, state }) {
@@ -757,7 +733,7 @@ const commonGtsVisitor = {
 							type: "ArrayExpression",
 							elements: [{
 								type: "ArrowFunctionExpression",
-								params: state.shortcutFunctionParameters,
+								params: [state.fnArgId],
 								body: {
 									type: "BlockStatement",
 									body: node.body.map((stmt) => visit(stmt))
@@ -791,7 +767,7 @@ const commonGtsVisitor = {
 	GTSShortcutFunctionExpression(node, { visit, state }) {
 		return {
 			type: "ArrowFunctionExpression",
-			params: state.shortcutFunctionParameters,
+			params: [state.fnArgId],
 			body: visit(node.body),
 			expression: node.expression,
 			loc: node.loc,
@@ -808,28 +784,6 @@ const commonGtsVisitor = {
 			loc: node.loc,
 			range: node.range
 		};
-	},
-	GTSQueryExpression(node, { state, visit }) {
-		return {
-			...node,
-			type: "CallExpression",
-			optional: false,
-			callee: {
-				type: "MemberExpression",
-				object: state.fnArgId,
-				property: node.star ? state.QueryAllLit : state.QueryLit,
-				computed: true,
-				optional: false
-			},
-			arguments: [{
-				type: "ArrowFunctionExpression",
-				body: visit(node.argument),
-				params: state.queryParameters,
-				expression: true,
-				loc: node.argument.loc,
-				range: node.argument.range
-			}]
-		};
 	}
 };
 const gtsVisitor = {
@@ -1099,16 +1053,6 @@ const gtsVisitor = {
 	...commonGtsVisitor
 };
 const initialTranspileState = (option = {}) => {
-	const shortcutFunctionPreludes = option.shortcutFunctionPreludes ?? DEFAULT_SHORTCUT_FUNCTION_PRELUDES;
-	const queryBindings = option.queryBindings ?? DEFAULT_QUERY_BINDINGS;
-	const fnArgId = {
-		type: "Identifier",
-		name: "__gts_fnArg"
-	};
-	const PreludeLit = {
-		type: "Literal",
-		value: "~prelude"
-	};
 	return {
 		createDefineFnId: {
 			type: "Identifier",
@@ -1122,66 +1066,14 @@ const initialTranspileState = (option = {}) => {
 			type: "Literal",
 			value: "~action"
 		},
-		PreludeLit,
-		fnArgId,
-		shortcutFunctionParameters: [fnArgId, {
-			type: "AssignmentPattern",
-			left: {
-				type: "ObjectPattern",
-				properties: shortcutFunctionPreludes.map((name) => ({
-					type: "Property",
-					computed: false,
-					key: {
-						type: "Identifier",
-						name
-					},
-					value: {
-						type: "Identifier",
-						name
-					},
-					kind: "init",
-					method: false,
-					shorthand: true
-				}))
-			},
-			right: {
-				type: "MemberExpression",
-				object: fnArgId,
-				property: PreludeLit,
-				computed: true,
-				optional: false
-			}
-		}],
+		fnArgId: {
+			type: "Identifier",
+			name: "__gts_fnArg"
+		},
 		rootVmId: {
 			type: "Identifier",
 			name: "__gts_rootVm"
 		},
-		queryParameters: [{
-			type: "ObjectPattern",
-			properties: queryBindings.map((name) => ({
-				type: "Property",
-				computed: false,
-				key: {
-					type: "Identifier",
-					name
-				},
-				value: {
-					type: "Identifier",
-					name
-				},
-				kind: "init",
-				method: false,
-				shorthand: true
-			}))
-		}],
-		QueryLit: {
-			type: "Literal",
-			value: "~query"
-		},
-		QueryAllLit: {
-			type: "Literal",
-			value: "~queryAll"
-		},
 		runtimeImportSource: option.runtimeImportSource ?? "@gi-tcg/gts-runtime",
 		providerImportSource: option.providerImportSource ?? "@gi-tcg/core/gts",
 		externalizedBindings: [],
@@ -1306,11 +1198,20 @@ function applyReplacements(state, code, mappings) {
         let ${payload.typingId} = ${typingIdLhs}.as();
         type ${payload.typingId} = typeof ${payload.typingId};
       `;
-		} else if (payload.type === "exitAttr") replacement = dedent`
+		} else if (payload.type === "exitAttr") {
+			const rewrittenMeta = `${payload.oldMetaType}_rewritten`;
+			const mergeFn = `${payload.oldMetaType}_mergeFn`;
+			const mergeFnRet = `${payload.oldMetaType}_mergeFnRet`;
+			replacement = dedent`
         type ${payload.returnType} = typeof ${payload.returnType};
-        type ${payload.newMetaType} = ${payload.returnType} extends { rewriteMeta: infer NewMeta extends {} } ? NewMeta : ${payload.oldMetaType}
+        type ${rewrittenMeta} = ${payload.returnType} extends { rewriteMeta: infer NewMeta extends {} } ? NewMeta : ${payload.oldMetaType};
+        let ${mergeFn}!: ${payload.defType} extends {
+          [${payload.attrName}]: { mergeMeta: infer M }
+       } ? M : null;
+        let ${mergeFnRet} = ${mergeFn}?.(null! as ${rewrittenMeta}, null! as ${payload.innerMetaType});
+        type ${payload.newMetaType} = [typeof ${mergeFn}] extends [null] ? ${rewrittenMeta} : typeof ${mergeFnRet};
       `;
-		else replacement = "";
+		} else replacement = "";
 		matchInfos.push({
 			sourceEnd: offset + match.length,
 			lengthOffset: replacement.length - match.length
@@ -1390,6 +1291,7 @@ const exitVM = (state, errorRange) => {
 		collectedAttrs: collectedAttrNames,
 		errorRange
 	}));
+	return { finalMetaId };
 };
 const enterAttr = (state, attrName) => {
 	const defTypeId = state.vmDefTypeIdStack.at(-1);
@@ -1425,7 +1327,7 @@ const genBindingTyping = (state, info) => {
 		typingId: info.typingId.name
 	}));
 };
-const exitAttr = (state, returningId) => {
+const exitAttr = (state, attrName, innerVMFinalMetaId, returningId) => {
 	const currentDefId = state.vmDefTypeIdStack.at(-1);
 	if (!currentDefId) return;
 	const newMetaTypeId = {
@@ -1436,6 +1338,8 @@ const exitAttr = (state, returningId) => {
 	state.typingPendingStatements.push(createReplacementHolder(state, {
 		type: "exitAttr",
 		defType: currentDefId.name,
+		attrName,
+		innerMetaType: innerVMFinalMetaId.name,
 		oldMetaType: oldMetaTypeId.name,
 		newMetaType: newMetaTypeId.name,
 		returnType: returningId.name
@@ -1616,10 +1520,11 @@ const gtsToTypingsWalker = {
 			}]
 		});
 		enterVMFromAttr(state, returnValue);
+		let exitVMResult;
 		if (body.namedAttributes) {
 			visit(body.namedAttributes);
-			exitVM(state, body.namedAttributes.range);
-		} else exitVM(state, name.range);
+			exitVMResult = exitVM(state, body.namedAttributes.range);
+		} else exitVMResult = exitVM(state, name.range);
 		if (bindingName) {
 			const export_ = node.bindingAccessModifier !== "private";
 			const typingId = {
@@ -1646,7 +1551,7 @@ const gtsToTypingsWalker = {
 				leadingComments: state.defineLeadingComments
 			});
 		}
-		exitAttr(state, returnValue);
+		exitAttr(state, attrName, exitVMResult.finalMetaId, returnValue);
 		return EMPTY;
 	},
 	GTSNamedAttributeBlock(node, { state, visit }) {
@@ -1686,7 +1591,7 @@ const gtsToTypingsWalker = {
 			}
 			const fn = {
 				type: "ArrowFunctionExpression",
-				params: state.shortcutFunctionParameters,
+				params: [state.fnArgId],
 				body: {
 					type: "BlockStatement",
 					body: node.directAction.body.map((stmt) => visit(stmt))
@@ -1761,6 +1666,14 @@ function getPrintOptions(source, state) {
 		getLeadingComments: (node) => node.leadingComments,
 		getTrailingComments: (node) => node.trailingComments,
 		getMappingData: () => DEFAULT_VOLAR_MAPPING_DATA,
+		beforeWriteNode: ({ range, isUntouched, context }) => {
+			if (isUntouched || !range) return;
+			context.writeMapped("", range.start, range.start, VERIFICATION_ONLY_MAPPING_DATA);
+		},
+		afterWriteNode: ({ range, isUntouched, context }) => {
+			if (isUntouched || !range) return;
+			context.writeMapped("", range.end, range.end, VERIFICATION_ONLY_MAPPING_DATA);
+		},
 		printers: {
 			Identifier(node, context) {
 				const identifier = node;
@@ -1780,11 +1693,6 @@ function getPrintOptions(source, state) {
 					context.write("\"");
 					context.writeMapped(text.slice(1, -1), node.range[0], node.range[1], LITERAL_FROM_ID_MAPPING_DATA);
 					context.write("\"");
-					const generatedEnd = context.generatedOffset;
-					context.createExtraMapping({
-						start: node.range[0],
-						end: node.range[1]
-					}, generatedStart, generatedEnd, VERIFICATION_ONLY_MAPPING_DATA);
 				} else if (state.attributeNameNodes.has(node) && node.range) context.writeMapped(node.raw ?? JSON.stringify(node.value), node.range[0], node.range[1], ATTRIBUTE_NAME_MAPPING_DATA);
 				else if (directActionStubRange = state.directActionStubRange.get(node)) context.writeMapped(node.raw ?? JSON.stringify(node.value), directActionStubRange.start, directActionStubRange.start + 1, DIRECT_ACTION_STUB_MAPPING_DATA);
 				else defaultPrinters.Literal(node, context);
@@ -1998,13 +1906,7 @@ function transform(ast, option = {}, sourceInfo = {}) {
 //#region src/config.ts
 const DEFAULT_GTS_CONFIG = {
 	runtimeImportSource: "@gi-tcg/gts-runtime",
-	providerImportSource: "@gi-tcg/core/gts",
-	shortcutFunctionPreludes: ["$"],
-	queryBindings: [
-		"my",
-		"opp",
-		"macros"
-	]
+	providerImportSource: "@gi-tcg/core/gts"
 };
 function* resolveGtsConfigImpl(filePath, inlineConfig = {}, options) {
 	const pathModule = options.pathModule || browserPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gi-tcg/gts-transpiler",
-  "version": "0.4.6",
+  "version": "0.6.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/piovium/gts.git"
@@ -22,7 +22,7 @@
     "@sveltejs/acorn-typescript": "^1.0.8",
     "acorn": "^8.15.0",
     "dedent": "^1.7.2",
-    "espolar": "^0.6.1",
+    "espolar": "^0.6.3",
     "esrap": "2.2.1",
     "magic-string": "^0.30.21",
     "path-browserify-esm": "^1.0.6",

package/src/config.ts

@@ -33,8 +33,6 @@ export interface ResolveGtsConfigAsyncOptions extends ResolveGtsConfigBaseOption
 const DEFAULT_GTS_CONFIG: Required<GtsConfig> = {
   runtimeImportSource: "@gi-tcg/gts-runtime",
   providerImportSource: "@gi-tcg/core/gts",
-  shortcutFunctionPreludes: ["$"],
-  queryBindings: ["my", "opp", "macros"],
 };
 
 function* resolveGtsConfigImpl(

package/src/keywords.ts

@@ -59,5 +59,4 @@ export const specialIdentifiers: string[] = [
   "type",
   // Our DSL Keywords
   "define",
-  "query",
 ];

package/src/parse/gts_plugin.ts

@@ -65,8 +65,6 @@ PrimaryExpression:
 ShortcutArgumentExpression:
     ":" Identifier
 
-UnaryExpression:
-+   query UnaryExpression
 */
 
 export interface GtsPluginOption {
@@ -318,38 +316,6 @@ export function gtsPlugin(options: GtsPluginOption = {}) {
         return super.parseExprAtom(refDestructuringErrors, forInit, forNew);
       }
 
-      override parseMaybeUnary(
-        refDestructuringErrors?: Parse.DestructuringErrors | null,
-        sawUnary?: boolean,
-        incDec?: boolean,
-        forInit?: boolean | "await",
-      ): AST.Expression {
-        if (this.isShortcutContext && this.isContextual("query")) {
-          const expr = this.gts_parseQueryExpression();
-          if (!incDec && this.eat(tokTypes.starstar)) {
-            this.unexpected(this.lastTokStart);
-          }
-          return expr;
-        }
-        return super.parseMaybeUnary(
-          refDestructuringErrors,
-          sawUnary,
-          incDec,
-          forInit,
-        );
-      }
-
-      gts_parseQueryExpression(
-        forInit?: boolean | "await",
-      ): AST.GTSQueryExpression {
-        const node = this.startNode() as AST.GTSQueryExpression;
-        this.next(); // consume 'query'
-        if (this.eat(tokTypes.star)) {
-          node.star = true;
-        }
-        node.argument = this.parseMaybeUnary(null, true, false, forInit);
-        return this.finishNode(node, "GTSQueryExpression");
-      }
     };
   };
 }

package/src/transform/gts.ts

@@ -16,11 +16,6 @@ import type {
 } from "estree";
 import { walk, type Visitors } from "zimmerframe";
 import { GtsTranspilerError } from "../error.ts";
-import {
-  DEFAULT_QUERY_BINDINGS,
-  DEFAULT_SHORTCUT_FUNCTION_PRELUDES,
-} from "./constants.ts";
-
 export interface ExternalizedBinding {
   bindingName: Identifier;
   export: boolean;
@@ -30,13 +25,8 @@ export interface TranspileState {
   readonly createDefineFnId: Identifier;
   readonly createBindingFnId: Identifier;
   readonly ActionLit: Literal;
-  readonly PreludeLit: Literal;
   readonly fnArgId: Identifier;
-  readonly shortcutFunctionParameters: Pattern[];
   readonly rootVmId: Identifier;
-  readonly queryParameters: Pattern[];
-  readonly QueryLit: Literal;
-  readonly QueryAllLit: Literal;
 
   readonly runtimeImportSource: string;
   readonly providerImportSource: string;
@@ -80,7 +70,7 @@ export const commonGtsVisitor: Visitors<Node, TranspileState> = {
               elements: [
                 {
                   type: "ArrowFunctionExpression",
-                  params: state.shortcutFunctionParameters,
+                  params: [state.fnArgId],
                   body: {
                     type: "BlockStatement",
                     body: node.body.map((stmt) => visit(stmt) as Statement),
@@ -115,7 +105,7 @@ export const commonGtsVisitor: Visitors<Node, TranspileState> = {
   ): ArrowFunctionExpression {
     return {
       type: "ArrowFunctionExpression",
-      params: state.shortcutFunctionParameters,
+      params: [state.fnArgId],
       body: visit(node.body) as Expression | BlockStatement,
       expression: node.expression,
       loc: node.loc,
@@ -133,30 +123,6 @@ export const commonGtsVisitor: Visitors<Node, TranspileState> = {
       range: node.range,
     };
   },
-  GTSQueryExpression(node, { state, visit }) {
-    return {
-      ...node,
-      type: "CallExpression",
-      optional: false,
-      callee: {
-        type: "MemberExpression",
-        object: state.fnArgId,
-        property: node.star ? state.QueryAllLit : state.QueryLit,
-        computed: true,
-        optional: false,
-      },
-      arguments: [
-        {
-          type: "ArrowFunctionExpression",
-          body: visit(node.argument) as Expression,
-          params: state.queryParameters,
-          expression: true,
-          loc: node.argument.loc,
-          range: node.argument.range,
-        },
-      ],
-    };
-  },
 };
 
 const gtsVisitor: Visitors<Node, TranspileState> = {
@@ -446,71 +412,18 @@ const gtsVisitor: Visitors<Node, TranspileState> = {
 export interface TranspileOption {
   runtimeImportSource?: string;
   providerImportSource?: string;
-  shortcutFunctionPreludes?: string[];
-  queryBindings?: string[];
 }
 
 export const initialTranspileState = (
   option: TranspileOption = {}
 ): TranspileState => {
-  const shortcutFunctionPreludes =
-    option.shortcutFunctionPreludes ?? DEFAULT_SHORTCUT_FUNCTION_PRELUDES;
-  const queryBindings = option.queryBindings ?? DEFAULT_QUERY_BINDINGS;
   const fnArgId: Identifier = { type: "Identifier", name: "__gts_fnArg" };
-  const PreludeLit: Literal = {
-    type: "Literal",
-    value: "~prelude",
-  };
-  const shortcutFunctionParameters: Pattern[] = [
-    fnArgId,
-    {
-      type: "AssignmentPattern",
-      left: {
-        type: "ObjectPattern",
-        properties: shortcutFunctionPreludes.map((name) => ({
-          type: "Property",
-          computed: false,
-          key: { type: "Identifier", name },
-          value: { type: "Identifier", name },
-          kind: "init",
-          method: false,
-          shorthand: true,
-        })),
-      },
-      right: {
-        type: "MemberExpression",
-        object: fnArgId,
-        property: PreludeLit,
-        computed: true,
-        optional: false,
-      },
-    },
-  ];
-  const queryParameters: Pattern[] = [
-    {
-      type: "ObjectPattern",
-      properties: queryBindings.map((name) => ({
-        type: "Property",
-        computed: false,
-        key: { type: "Identifier", name },
-        value: { type: "Identifier", name },
-        kind: "init",
-        method: false,
-        shorthand: true,
-      })),
-    },
-  ];
   return {
     createDefineFnId: { type: "Identifier", name: "__gts_createDefine" },
     createBindingFnId: { type: "Identifier", name: "__gts_createBinding" },
     ActionLit: { type: "Literal", value: "~action" },
-    PreludeLit,
     fnArgId,
-    shortcutFunctionParameters,
     rootVmId: { type: "Identifier", name: "__gts_rootVm" },
-    queryParameters,
-    QueryLit: { type: "Literal", value: "~query" },
-    QueryAllLit: { type: "Literal", value: "~queryAll" },
 
     runtimeImportSource: option.runtimeImportSource ?? "@gi-tcg/gts-runtime",
     providerImportSource: option.providerImportSource ?? "@gi-tcg/core/gts",

package/src/transform/volar/printer.ts

@@ -41,6 +41,20 @@ export function getPrintOptions(
     getLeadingComments: (node) => (node as Node).leadingComments,
     getTrailingComments: (node) => (node as Node).trailingComments,
     getMappingData: () => DEFAULT_VOLAR_MAPPING_DATA,
+    // Add a 0-length mapping before and after each touched node with verification only,
+    // so that error squiggles start/ends at those positions can be reflected.
+    beforeWriteNode: ({ range, isUntouched, context }) => {
+      if (isUntouched || !range) {
+        return;
+      }
+      context.writeMapped("", range.start, range.start, VERIFICATION_ONLY_MAPPING_DATA);
+    },
+    afterWriteNode: ({ range, isUntouched, context }) => {
+      if (isUntouched || !range) {
+        return;
+      }
+      context.writeMapped("", range.end, range.end, VERIFICATION_ONLY_MAPPING_DATA);
+    },
     printers: {
       // 1) Make the print of dummy identifier print nothing.
       //    Exception: if GTS attribute list's last argument is dummy, e.g.
@@ -94,17 +108,6 @@ export function getPrintOptions(
             LITERAL_FROM_ID_MAPPING_DATA,
           );
           context.write('"');
-          const generatedEnd = context.generatedOffset;
-          // Map error squiggle at quotation mark to the inner content
-          context.createExtraMapping(
-            {
-              start: node.range[0],
-              end: node.range[1],
-            },
-            generatedStart,
-            generatedEnd,
-            VERIFICATION_ONLY_MAPPING_DATA,
-          )
         } else if (state.attributeNameNodes.has(node) && node.range) {
           context.writeMapped(
             node.raw ?? JSON.stringify((node as EspolarAST.Literal).value),

package/src/transform/volar/replacements.ts

@@ -51,6 +51,8 @@ type ReplacementPayload =
       type: "exitAttr";
       returnType: string;
       defType: string;
+      attrName: string;
+      innerMetaType: string;
       oldMetaType: string;
       newMetaType: string;
     };
@@ -194,9 +196,17 @@ export function applyReplacements(
         type ${payload.typingId} = typeof ${payload.typingId};
       `;
       } else if (payload.type === "exitAttr") {
+        const rewrittenMeta = `${payload.oldMetaType}_rewritten`;
+        const mergeFn = `${payload.oldMetaType}_mergeFn`;
+        const mergeFnRet = `${payload.oldMetaType}_mergeFnRet`;
         replacement = dedent`
         type ${payload.returnType} = typeof ${payload.returnType};
-        type ${payload.newMetaType} = ${payload.returnType} extends { rewriteMeta: infer NewMeta extends {} } ? NewMeta : ${payload.oldMetaType}
+        type ${rewrittenMeta} = ${payload.returnType} extends { rewriteMeta: infer NewMeta extends {} } ? NewMeta : ${payload.oldMetaType};
+        let ${mergeFn}!: ${payload.defType} extends {
+          [${payload.attrName}]: { mergeMeta: infer M }
+       } ? M : null;
+        let ${mergeFnRet} = ${mergeFn}?.(null! as ${rewrittenMeta}, null! as ${payload.innerMetaType});
+        type ${payload.newMetaType} = [typeof ${mergeFn}] extends [null] ? ${rewrittenMeta} : typeof ${mergeFnRet};
       `;
       } else {
         replacement = "";

package/src/transform/volar/walker.ts

@@ -168,7 +168,14 @@ const enterVMFromAttr = (
   state.attrsOfCurrentVm.push([]);
 };
 
-const exitVM = (state: TypingTranspileState, errorRange?: [number, number]) => {
+interface ExitVMResult {
+  finalMetaId: Identifier;
+}
+
+const exitVM = (
+  state: TypingTranspileState,
+  errorRange?: [number, number],
+): ExitVMResult => {
   const currentDefTypeId = state.vmDefTypeIdStack.pop()!;
   const currentMetaId = state.metaTypeIdStack.pop()!;
   const finalMetaId = state.finalMetaTypeIdStack.pop()!;
@@ -183,17 +190,24 @@ const exitVM = (state: TypingTranspileState, errorRange?: [number, number]) => {
       errorRange,
     }),
   );
+  return { finalMetaId };
 };
 
+interface EnterAttrResult {
+  lhsId: Identifier;
+}
+
 const enterAttr = (
   state: TypingTranspileState,
   attrName: string,
-): { lhsId: Identifier } => {
+): EnterAttrResult => {
   const defTypeId = state.vmDefTypeIdStack.at(-1);
   const metaTypeId = state.metaTypeIdStack.at(-1);
   if (!defTypeId || !metaTypeId) {
     // FIXME error handling?
-    return { lhsId: { type: "Identifier", name: "__gts_invalid_attr_obj" } };
+    return {
+      lhsId: { type: "Identifier", name: "__gts_invalid_attr_obj" },
+    };
   }
   state.attrsOfCurrentVm.at(-1)!.push(attrName);
   const lhsId: Identifier = {
@@ -210,7 +224,7 @@ const enterAttr = (
       hintOnly: attrName === ATTR_HINT_ATTR_NAME,
     }),
   );
-  return { lhsId: lhsId };
+  return { lhsId };
 };
 
 const genBindingTyping = (
@@ -236,7 +250,12 @@ const genBindingTyping = (
   );
 };
 
-const exitAttr = (state: TypingTranspileState, returningId: Identifier) => {
+const exitAttr = (
+  state: TypingTranspileState,
+  attrName: string,
+  innerVMFinalMetaId: Identifier,
+  returningId: Identifier,
+) => {
   const currentDefId = state.vmDefTypeIdStack.at(-1);
   if (!currentDefId) {
     return;
@@ -250,6 +269,8 @@ const exitAttr = (state: TypingTranspileState, returningId: Identifier) => {
     createReplacementHolder(state, {
       type: "exitAttr",
       defType: currentDefId.name,
+      attrName,
+      innerMetaType: innerVMFinalMetaId.name,
       oldMetaType: oldMetaTypeId.name,
       newMetaType: newMetaTypeId.name,
       returnType: returningId.name,
@@ -473,11 +494,12 @@ export const gtsToTypingsWalker: Visitors<Node, TypingTranspileState> = {
       ],
     });
     enterVMFromAttr(state, returnValue);
+    let exitVMResult: ExitVMResult;
     if (body.namedAttributes) {
       visit(body.namedAttributes);
-      exitVM(state, body.namedAttributes.range);
+      exitVMResult = exitVM(state, body.namedAttributes.range);
     } else {
-      exitVM(state, name.range);
+      exitVMResult = exitVM(state, name.range);
     }
     if (bindingName) {
       const export_ = node.bindingAccessModifier !== "private";
@@ -505,7 +527,7 @@ export const gtsToTypingsWalker: Visitors<Node, TypingTranspileState> = {
         leadingComments: state.defineLeadingComments,
       });
     }
-    exitAttr(state, returnValue);
+    exitAttr(state, attrName, exitVMResult.finalMetaId, returnValue);
     return EMPTY;
   },
   GTSNamedAttributeBlock(node, { state, visit }) {
@@ -561,7 +583,7 @@ export const gtsToTypingsWalker: Visitors<Node, TypingTranspileState> = {
       }
       const fn: ArrowFunctionExpression = {
         type: "ArrowFunctionExpression",
-        params: state.shortcutFunctionParameters,
+        params: [state.fnArgId],
         body: {
           type: "BlockStatement",
           body: node.directAction.body.map((stmt) => visit(stmt) as Statement),

package/src/types.ts

@@ -21,7 +21,6 @@ declare module "estree" {
   interface ExpressionMap {
     GTSShortcutArgumentExpression: GTSShortcutArgumentExpression;
     GTSShortcutFunctionExpression: GTSShortcutFunctionExpression;
-    GTSQueryExpression: GTSQueryExpression;
   }
   
   interface SimpleCallExpression {
@@ -77,11 +76,6 @@ declare module "estree" {
     expression: boolean;
   }
 
-  interface GTSQueryExpression extends BaseExpression {
-    type: "GTSQueryExpression";
-    star?: boolean;
-    argument: Expression;
-  }
 }
 
 declare module "acorn" {

package/src/transform/constants.ts

@@ -1,2 +0,0 @@
-export const DEFAULT_SHORTCUT_FUNCTION_PRELUDES: string[] = ["$"];
-export const DEFAULT_QUERY_BINDINGS: string[] = ["my", "opp", "macros"];