@gi-tcg/gts-transpiler 0.6.8 → 0.7.1

package/dist/index.js

@@ -185,8 +185,10 @@ function gtsPlugin(options = {}) {
 					if (this.type === tokTypes.braceL) break;
 					if (this.type === tokTypes.semi || this.canInsertSemicolon()) break;
 					if (this.isContextual("as")) break;
-					if (!first) this.expect(tokTypes.comma);
-					else first = false;
+					if (!first) {
+						this.expect(tokTypes.comma);
+						if (this.type === tokTypes.braceL) break;
+					} else first = false;
 					node.attributes.push(this.gts_parseAttributeExpression());
 				}
 				return this.finishNode(node, "GTSPositionalAttributeList");
@@ -227,7 +229,7 @@ function gtsPlugin(options = {}) {
 					this.next();
 					return this.gts_parseShortcutFunction();
 				}
-				if (this.gtsOptions.allowEmptyPositionalAttribute && (this.type === tokTypes.comma || this.type === tokTypes.braceR || this.type === tokTypes.semi || this.canInsertSemicolon() || this.isContextual("as"))) {
+				if (this.gtsOptions.allowEmptyPositionalAttribute && (this.type === tokTypes.comma || this.type === tokTypes.braceR || this.type === tokTypes.semi || this.isContextual("as"))) {
 					const dummy = this.startNodeAt(this.lastTokEnd, this.lastTokEndLoc);
 					dummy.name = "✖";
 					dummy.isDummy = true;
@@ -388,7 +390,11 @@ function getCommentHandlers(source, comments, index = 0) {
 						if (node.innerComments && node.innerComments.length > 0) return;
 					}
 					const parent = path.at(-1);
-					if (parent === void 0 || node.end !== parent.end) {
+					if (parent === void 0) {
+						while (comments.length) (node.leadingComments ||= []).push(comments.shift());
+						return;
+					}
+					if (node.end !== parent.end) {
 						const slice = source.slice(node.end, comments[0].start);
 						let is_last_in_array = false;
 						/** @type {(AST.Node | null)[] | null} */
@@ -1253,8 +1259,8 @@ function applyReplacements(state, code, mappings) {
         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});
+       } ? M : <const T>(x: T, y: unknown) => T;
+        let ${mergeFnRet} = ${mergeFn}(null! as ${rewrittenMeta}, null! as ${payload.innerMetaType});
         type ${payload.newMetaType} = [typeof ${mergeFn}] extends [null] ? ${rewrittenMeta} : typeof ${mergeFnRet};
       `;
 		} else replacement = "";
@@ -1399,7 +1405,6 @@ const insertHintStatement = (state, whiteSpaceStart, whiteSpaceEnd) => {
 		whiteSpaceStart,
 		whiteSpaceEnd
 	});
-	`${state.idCounter++}`;
 };
 const gtsToTypingsWalker = {
 	Program(node, { state, visit }) {
@@ -1795,7 +1800,7 @@ function getPrintOptions(source, state) {
 				context.writeNode(node.object);
 				context.write(".");
 				context.writeSource(node.whiteSpaceStart, node.whiteSpaceEnd);
-				context.write(";");
+				context.write("// @ts-ignore\nωAttrNameHint;");
 			},
 			ErrorStatement(node, context) {
 				if (node.range) {

package/package.json

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

package/src/parse/comment.js

@@ -184,9 +184,21 @@ export function getCommentHandlers(source, comments, index = 0) {
 							}
 						}
 
-						const parent = /** @type {AST.Node & AST.NodeWithLocation} */ (path.at(-1));
+						const parent = /** @type {AST.Node & AST.NodeWithLocation | undefined} */ (path.at(-1));
+
+						// A comment-only file leaves Program as the sole visited node. There is
+						// no parent to use for sibling-based attachment, so retain the remaining
+						// comments on Program itself.
+						if (parent === undefined) {
+							while (comments.length) {
+								(node.leadingComments ||= []).push(
+									/** @type {AST.CommentWithLocation} */ (comments.shift()),
+								);
+							}
+							return;
+						}
 
-						if (parent === undefined || node.end !== parent.end) {
+						if (node.end !== parent.end) {
 							const slice = source.slice(node.end, comments[0].start);
 
 							// Check if this node is the last item in an array-like structure
@@ -408,4 +420,4 @@ export function getCommentHandlers(source, comments, index = 0) {
 			});
 		},
 	};
-}
+}

package/src/parse/gts_plugin.ts

@@ -20,6 +20,7 @@ AttributeName:
 
 AttributeBody:
     PositionalAttributeList? NamedAttributeBlock? 
+    PositionalAttributeList "," NamedAttributeBlock
 
 AttributeBindingClause:
     "as" BindingAccessModifier? Identifier
@@ -44,7 +45,7 @@ AttributeExpression:
     ":" ShortcutFunction
     # Intentionally disable object literal, for distinction to named attribute block
     # foo bar { baz = 1 };
-    # foo bar, { baz: 1 };   // If allowed, hard to distinguish
+    # foo bar, { baz: 1 };   // Named attribute block
     # foo bar, ({ baz: 1 }); // OK
     [lookahead != "{"] CallExpression OptionalChain?
     [lookahead != "{"] MemberExpression OptionalChain?
@@ -181,6 +182,10 @@ export function gtsPlugin(options: GtsPluginOption = {}) {
           }
           if (!first) {
             this.expect(tokTypes.comma);
+            // A trailing comma is only valid before a named attribute block.
+            if (this.type === tokTypes.braceL) {
+              break;
+            }
           } else {
             first = false;
           }
@@ -247,7 +252,6 @@ export function gtsPlugin(options: GtsPluginOption = {}) {
           (this.type === tokTypes.comma ||
             this.type === tokTypes.braceR ||
             this.type === tokTypes.semi ||
-            this.canInsertSemicolon() ||
             this.isContextual("as"))
         ) {
           // Allow omitting the attribute expression for language tooling

package/src/transform/volar/printer.ts

@@ -236,7 +236,7 @@ export function getPrintOptions(
         context.writeNode(node.object as EspolarAST.Node);
         context.write(".");
         context.writeSource(node.whiteSpaceStart, node.whiteSpaceEnd);
-        context.write(";");
+        context.write("// @ts-ignore\nωAttrNameHint;");
       },
       ErrorStatement(node: any, context: PrinterContext<CodeInformation>) {
         if (node.range) {

package/src/transform/volar/replacements.ts

@@ -204,8 +204,8 @@ export function applyReplacements(
         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});
+       } ? M : <const T>(x: T, y: unknown) => T;
+        let ${mergeFnRet} = ${mergeFn}(null! as ${rewrittenMeta}, null! as ${payload.innerMetaType});
         type ${payload.newMetaType} = [typeof ${mergeFn}] extends [null] ? ${rewrittenMeta} : typeof ${mergeFnRet};
       `;
       } else {

package/src/transform/volar/walker.ts

@@ -290,10 +290,6 @@ const insertHintStatement = (
     whiteSpaceStart,
     whiteSpaceEnd,
   } satisfies GTSAttributeNameHintStatement as any);
-  const returnValue: Identifier = {
-    type: "Identifier",
-    name: `__gts_attrRet_hint_${state.idCounter++}`,
-  };
   // do NOT exitAttr (rewrite meta) since hint is a incomplete structure
 };