@gi-tcg/gts-transpiler 0.7.0 → 0.7.2

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import * as acorn from "acorn";
 import { Options as Options$1, Parser as Parser$1 } from "acorn";
+import { AST as AST$1 } from "espolar";
 import * as AST from "estree";
 import { Program, SourceLocation } from "estree";
 import { SourceMap } from "magic-string";
@@ -1528,8 +1529,11 @@ interface ResolveGtsConfigAsyncOptions extends ResolveGtsConfigBaseOptions {
 declare function resolveGtsConfig(filePath: string, inlineConfig: GtsConfig, options: ResolveGtsConfigAsyncOptions): Promise<Required<GtsConfig>>;
 declare function resolveGtsConfigSync(filePath: string, inlineConfig: GtsConfig, options: ResolveGtsConfigSyncOptions): Required<GtsConfig>;
 //#endregion
+//#region src/utils/index.d.ts
+declare function isGtsShortcutArgumentStartingConciseBody(node: AST$1.Expression | AST$1.BlockStatement | AST$1.PrivateIdentifier): boolean;
+//#endregion
 //#region src/index.d.ts
 declare function transpile(source: string, filename: string, option: TranspileOption): TranspileResult;
 declare function transpileForVolar(source: string, filename: string, option: TranspileOption): VolarMappingResult;
 //#endregion
-export { type AST, type GtsConfig, type ParseLooseOptions as GtsParseLooseOptions, type ParseOptions as GtsParseOptions, GtsTranspilerError, type PathModule, type ResolveGtsConfigAsyncOptions, type ResolveGtsConfigSyncOptions, type TranspileOption, type TranspileResult, type VolarMappingResult, parse, parseLoose, resolveGtsConfig, resolveGtsConfigSync, transpile, transpileForVolar };
+export { type AST, type GtsConfig, type ParseLooseOptions as GtsParseLooseOptions, type ParseOptions as GtsParseOptions, GtsTranspilerError, type PathModule, type ResolveGtsConfigAsyncOptions, type ResolveGtsConfigSyncOptions, type TranspileOption, type TranspileResult, type VolarMappingResult, isGtsShortcutArgumentStartingConciseBody, parse, parseLoose, resolveGtsConfig, resolveGtsConfigSync, transpile, transpileForVolar };

package/dist/index.js

@@ -3,7 +3,7 @@ import { tsPlugin } from "@sveltejs/acorn-typescript";
 import { walk } from "zimmerframe";
 import { print } from "esrap";
 import jsPrinter from "esrap/languages/ts";
-import { defaultPrinters, print as print$1 } from "espolar";
+import { canStartConciseBody, defaultPrinters, print as print$1 } from "espolar";
 import dedent from "dedent";
 import browserPath from "path-browserify-esm";
 //#region src/keywords.ts
@@ -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} */
@@ -2031,6 +2037,17 @@ function* readPackageConfig(readFileFn, pkgPath) {
 	}
 }
 //#endregion
+//#region src/utils/index.ts
+function isGtsShortcutArgument(node) {
+	return node.type === "GTSShortcutArgumentExpression";
+}
+function canStartConciseBodyGts(node) {
+	return canStartConciseBody(node, isGtsShortcutArgument);
+}
+function isGtsShortcutArgumentStartingConciseBody(node) {
+	return !canStartConciseBodyGts(node) && canStartConciseBody(node);
+}
+//#endregion
 //#region src/index.ts
 function transpile(source, filename, option) {
 	return transform(parse(source), option, {
@@ -2045,4 +2062,4 @@ function transpileForVolar(source, filename, option) {
 	});
 }
 //#endregion
-export { GtsTranspilerError, parse, parseLoose, resolveGtsConfig, resolveGtsConfigSync, transpile, transpileForVolar };
+export { GtsTranspilerError, isGtsShortcutArgumentStartingConciseBody, parse, parseLoose, resolveGtsConfig, resolveGtsConfigSync, transpile, transpileForVolar };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gi-tcg/gts-transpiler",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "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.3",
+    "espolar": "^0.6.5",
     "esrap": "2.2.1",
     "magic-string": "^0.30.21",
     "path-browserify-esm": "^1.0.6",

package/src/index.ts

@@ -56,3 +56,4 @@ export {
   type ResolveGtsConfigSyncOptions,
   type PathModule,
 } from "./config.ts";
+export { isGtsShortcutArgumentStartingConciseBody } from "./utils/index.ts";

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/utils/index.ts

@@ -0,0 +1,13 @@
+import { canStartConciseBody, type AST } from "espolar";
+
+function isGtsShortcutArgument(node: AST.Node) {
+  return (node.type as string) === "GTSShortcutArgumentExpression";
+}
+
+function canStartConciseBodyGts(node: AST.Expression | AST.BlockStatement | AST.PrivateIdentifier): boolean {
+  return canStartConciseBody(node, isGtsShortcutArgument);
+}
+
+export function isGtsShortcutArgumentStartingConciseBody(node: AST.Expression | AST.BlockStatement | AST.PrivateIdentifier): boolean {
+  return !canStartConciseBodyGts(node) && canStartConciseBody(node);
+}