@gi-tcg/gts-transpiler 0.5.0 → 0.6.0

package/dist/index.js

@@ -1198,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
@@ -1282,6 +1291,7 @@ const exitVM = (state, errorRange) => {
 		collectedAttrs: collectedAttrNames,
 		errorRange
 	}));
+	return { finalMetaId };
 };
 const enterAttr = (state, attrName) => {
 	const defTypeId = state.vmDefTypeIdStack.at(-1);
@@ -1317,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 = {
@@ -1328,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
@@ -1508,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 = {
@@ -1538,7 +1551,7 @@ const gtsToTypingsWalker = {
 				leadingComments: state.defineLeadingComments
 			});
 		}
-		exitAttr(state, returnValue);
+		exitAttr(state, attrName, exitVMResult.finalMetaId, returnValue);
 		return EMPTY;
 	},
 	GTSNamedAttributeBlock(node, { state, visit }) {

package/package.json

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

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 }) {