@gi-tcg/gts-transpiler 0.4.2 → 0.4.4

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();
@@ -713,17 +713,12 @@ const eraseTs = (ast) => {
 };
 //#endregion
 //#region src/transform/constants.ts
-const DEFAULT_SHORTCUT_FUNCTION_PRELUDES = [
-	"cryo",
-	"hydro",
-	"pyro",
-	"electro",
-	"anemo",
-	"geo",
-	"dendro",
-	"omni"
+const DEFAULT_SHORTCUT_FUNCTION_PRELUDES = ["$"];
+const DEFAULT_QUERY_BINDINGS = [
+	"my",
+	"opp",
+	"macros"
 ];
-const DEFAULT_QUERY_BINDINGS = ["my", "opp"];
 //#endregion
 //#region src/transform/gts.ts
 const commonGtsVisitor = {
@@ -1245,10 +1240,11 @@ function applyReplacements(state, code, mappings) {
 			const lhs = `${payload.finalMetaType}_lhs`;
 			const requiredAttrsNs = `${payload.finalMetaType}_rans`;
 			const collectedAttrsExpr = `${payload.collectedAttrs.join(" | ") || "never"}`;
-			const needleString = `"${requiredAttrsNs}_NeedleString" as any as "required attributes are missing"`;
+			const length = payload.errorRange ? payload.errorRange[1] - payload.errorRange[0] : 0;
+			const needleString = `"${requiredAttrsNs}_NeedleString${"0".repeat(length)}" as string as ${requiredAttrsNs}.DiagMsg`;
 			if (payload.errorRange) state.extraMappings.push({
 				sourceOffset: payload.errorRange[0],
-				length: payload.errorRange[1] - payload.errorRange[0],
+				length,
 				generatedNeedle: needleString
 			});
 			replacement = dedent`
@@ -1257,7 +1253,13 @@ function applyReplacements(state, code, mappings) {
         type ${lhs} = typeof ${lhs};
         namespace ${requiredAttrsNs} {
           export type Collected = ${collectedAttrsExpr};
-          export type Expected = { [K in keyof ${payload.defType}]: ${lhs}[K] extends { required(this: ${lhs}): true } ? K : never }[keyof ${payload.defType}];
+          export type Expected = {
+            [K in keyof ${payload.defType}]: ${lhs}[K] extends { required(this: ${lhs}): true } ? K : never;
+          }[keyof ${payload.defType}];
+          type DiagObj = {
+            [K in Expected]: K extends Collected ? never : \`'\${K}' is a required attribute but not provided\`;
+          }
+          export type DiagMsg = DiagObj[Expected];
         };
         ((_: ${requiredAttrsNs}.Expected extends ${requiredAttrsNs}.Collected ? string : ${requiredAttrsNs}.Expected) => 0)(${needleString});
       `;
@@ -1563,7 +1565,7 @@ const gtsToTypingsWalker = {
 				};
 				state.literalFromIdentifier.add(lit);
 				return lit;
-			} else return { ...visit(attr) };
+			} else return visit(attr);
 		});
 		const returnValue = {
 			type: "Identifier",
@@ -1601,11 +1603,11 @@ const gtsToTypingsWalker = {
 				}
 			}]
 		});
+		enterVMFromAttr(state, returnValue);
 		if (body.namedAttributes) {
-			enterVMFromAttr(state, returnValue);
 			visit(body.namedAttributes);
 			exitVM(state, body.namedAttributes.range);
-		}
+		} else exitVM(state, name.range);
 		if (bindingName) {
 			const export_ = node.bindingAccessModifier !== "private";
 			const typingId = {
@@ -1968,17 +1970,12 @@ function transform(ast, option = {}, sourceInfo = {}) {
 const DEFAULT_GTS_CONFIG = {
 	runtimeImportSource: "@gi-tcg/gts-runtime",
 	providerImportSource: "@gi-tcg/core/gts",
-	shortcutFunctionPreludes: [
-		"cryo",
-		"hydro",
-		"pyro",
-		"electro",
-		"anemo",
-		"geo",
-		"dendro",
-		"omni"
-	],
-	queryBindings: ["my", "opp"]
+	shortcutFunctionPreludes: ["$"],
+	queryBindings: [
+		"my",
+		"opp",
+		"macros"
+	]
 };
 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.2",
+  "version": "0.4.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/piovium/gts.git"

package/src/config.ts

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

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/constants.ts

@@ -1,11 +1,2 @@
-export const DEFAULT_SHORTCUT_FUNCTION_PRELUDES: string[] = [
-  "cryo",
-  "hydro",
-  "pyro",
-  "electro",
-  "anemo",
-  "geo",
-  "dendro",
-  "omni",
-];
-export const DEFAULT_QUERY_BINDINGS: string[] = ["my", "opp"];
+export const DEFAULT_SHORTCUT_FUNCTION_PRELUDES: string[] = ["$"];
+export const DEFAULT_QUERY_BINDINGS: string[] = ["my", "opp", "macros"];

package/src/transform/volar/replacements.ts

@@ -121,11 +121,15 @@ export function applyReplacements(
         const lhs = `${payload.finalMetaType}_lhs`;
         const requiredAttrsNs = `${payload.finalMetaType}_rans`;
         const collectedAttrsExpr = `${payload.collectedAttrs.join(" | ") || "never"}`;
-        const needleString = `"${requiredAttrsNs}_NeedleString" as any as "required attributes are missing"`;
+        const length = payload.errorRange
+          ? payload.errorRange[1] - payload.errorRange[0]
+          : 0;
+        // Ensure that generated needle string is longer than error range so that error squiggle can cover all
+        const needleString = `"${requiredAttrsNs}_NeedleString${"0".repeat(length)}" as string as ${requiredAttrsNs}.DiagMsg`;
         if (payload.errorRange) {
           state.extraMappings.push({
             sourceOffset: payload.errorRange[0],
-            length: payload.errorRange[1] - payload.errorRange[0],
+            length,
             generatedNeedle: needleString,
           });
         }
@@ -135,7 +139,13 @@ export function applyReplacements(
         type ${lhs} = typeof ${lhs};
         namespace ${requiredAttrsNs} {
           export type Collected = ${collectedAttrsExpr};
-          export type Expected = { [K in keyof ${payload.defType}]: ${lhs}[K] extends { required(this: ${lhs}): true } ? K : never }[keyof ${payload.defType}];
+          export type Expected = {
+            [K in keyof ${payload.defType}]: ${lhs}[K] extends { required(this: ${lhs}): true } ? K : never;
+          }[keyof ${payload.defType}];
+          type DiagObj = {
+            [K in Expected]: K extends Collected ? never : \`'\${K}' is a required attribute but not provided\`;
+          }
+          export type DiagMsg = DiagObj[Expected];
         };
         ((_: ${requiredAttrsNs}.Expected extends ${requiredAttrsNs}.Collected ? string : ${requiredAttrsNs}.Expected) => 0)(${needleString});
       `;

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;
         }
       },
     );
@@ -434,10 +434,12 @@ export const gtsToTypingsWalker: Visitors<Node, TypingTranspileState> = {
         },
       ],
     });
+    enterVMFromAttr(state, returnValue);
     if (body.namedAttributes) {
-      enterVMFromAttr(state, returnValue);
       visit(body.namedAttributes);
       exitVM(state, body.namedAttributes.range);
+    } else {
+      exitVM(state, name.range);
     }
     if (bindingName) {
       const export_ = node.bindingAccessModifier !== "private";