@gi-tcg/gts-transpiler 0.4.1 → 0.4.3

package/dist/index.d.ts

@@ -615,15 +615,21 @@ declare class GtsTranspilerError extends Error {
 interface GtsConfig extends TranspileOption {}
 type ReadFileFn = (path: string, encoding: "utf8") => string;
 type ReadFileAsyncFn = (path: string, encoding: "utf8") => Promise<string>;
-interface ResolveGtsConfigSyncOptions {
-  readFileFn: ReadFileFn;
+interface PathModule {
+  resolve(...paths: string[]): string;
+  dirname(path: string): string;
+  isAbsolute(path: string): boolean;
+}
+interface ResolveGtsConfigBaseOptions {
   cwd?: string;
+  pathModule?: PathModule;
   stopDir?: string;
 }
-interface ResolveGtsConfigAsyncOptions {
+interface ResolveGtsConfigSyncOptions extends ResolveGtsConfigBaseOptions {
+  readFileFn: ReadFileFn;
+}
+interface ResolveGtsConfigAsyncOptions extends ResolveGtsConfigBaseOptions {
   readFileFn: ReadFileAsyncFn;
-  cwd?: string;
-  stopDir?: string;
 }
 declare function resolveGtsConfig(filePath: string, inlineConfig: GtsConfig, options: ResolveGtsConfigAsyncOptions): Promise<Required<GtsConfig>>;
 declare function resolveGtsConfigSync(filePath: string, inlineConfig: GtsConfig, options: ResolveGtsConfigSyncOptions): Required<GtsConfig>;
@@ -632,4 +638,4 @@ declare function resolveGtsConfigSync(filePath: string, inlineConfig: GtsConfig,
 declare function transpile(source: string, filename: string, option: TranspileOption): TranspileResult;
 declare function transpileForVolar(source: string, filename: string, option: TranspileOption): VolarMappingResult;
 //#endregion
-export { type GtsConfig, type ParseLooseOptions as GtsParseLooseOptions, type ParseOptions as GtsParseOptions, GtsTranspilerError, type TranspileOption, type TranspileResult, type VolarMappingResult, parse, parseLoose, resolveGtsConfig, resolveGtsConfigSync, transpile, transpileForVolar };
+export { 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 };

package/dist/index.js

@@ -5,7 +5,7 @@ import { print } from "esrap";
 import jsPrinter from "esrap/languages/ts";
 import { defaultPrinters, print as print$1 } from "espolar";
 import dedent from "dedent";
-import path from "path-browserify-esm";
+import browserPath from "path-browserify-esm";
 //#region src/keywords.ts
 const specialIdentifiers = [
 	"break",
@@ -166,7 +166,7 @@ function gtsPlugin(options = {}) {
 				node.attributes = [];
 				this.expect(tokTypes.braceL);
 				while (this.type !== tokTypes.braceR && this.type !== tokTypes.eof) {
-					if (specialIdentifiers.includes(this.value) || this.type === tokTypes.colon) {
+					if (this.type !== tokTypes.string && specialIdentifiers.includes(this.value) || this.type === tokTypes.colon) {
 						node.directAction = this.gts_parseDirectFunction();
 						break;
 					}
@@ -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();
@@ -1563,7 +1563,7 @@ const gtsToTypingsWalker = {
 				};
 				state.literalFromIdentifier.add(lit);
 				return lit;
-			} else return { ...visit(attr) };
+			} else return visit(attr);
 		});
 		const returnValue = {
 			type: "Identifier",
@@ -1976,14 +1976,16 @@ const DEFAULT_GTS_CONFIG = {
 		"anemo",
 		"geo",
 		"dendro",
-		"omni"
+		"omni",
+		"$"
 	],
 	queryBindings: ["my", "opp"]
 };
 function* resolveGtsConfigImpl(filePath, inlineConfig = {}, options) {
-	const startDir = normalizeStartDir(filePath, options.cwd);
-	const stopDir = options.stopDir ? path.resolve(options.stopDir) : void 0;
-	const pkgConfig = yield* findNearestPackageConfig(options.readFileFn, startDir, stopDir);
+	const pathModule = options.pathModule || browserPath;
+	const startDir = normalizeStartDir(filePath, pathModule, options.cwd);
+	const stopDir = options.stopDir ? pathModule.resolve(options.stopDir) : void 0;
+	const pkgConfig = yield* findNearestPackageConfig(options.readFileFn, pathModule, startDir, stopDir);
 	return {
 		...DEFAULT_GTS_CONFIG,
 		...pkgConfig,
@@ -1991,6 +1993,7 @@ function* resolveGtsConfigImpl(filePath, inlineConfig = {}, options) {
 	};
 }
 async function resolveGtsConfig(filePath, inlineConfig, options) {
+	options.pathModule ??= await import("node:path").then((mod) => mod.default);
 	const generator = resolveGtsConfigImpl(filePath, inlineConfig, options);
 	let result = generator.next();
 	while (!result.done) {
@@ -2011,16 +2014,16 @@ function resolveGtsConfigSync(filePath, inlineConfig, options) {
 	}
 	return result.value;
 }
-function normalizeStartDir(sourceFile, cwd) {
-	const absolute = path.isAbsolute(sourceFile) ? sourceFile : path.resolve(cwd || ".", sourceFile);
-	return path.dirname(absolute);
+function normalizeStartDir(sourceFile, pathModule, cwd) {
+	const absolute = pathModule.isAbsolute(sourceFile) ? sourceFile : pathModule.resolve(cwd || ".", sourceFile);
+	return pathModule.dirname(absolute);
 }
-function* findNearestPackageConfig(readFileFn, startDir, stopDir) {
+function* findNearestPackageConfig(readFileFn, pathModule, startDir, stopDir) {
 	let currentDir = startDir;
 	while (true) {
-		const config = yield* readPackageConfig(readFileFn, path.resolve(currentDir, "package.json"));
+		const config = yield* readPackageConfig(readFileFn, pathModule.resolve(currentDir, "package.json"));
 		if (config) return config;
-		const parentDir = path.dirname(currentDir);
+		const parentDir = pathModule.dirname(currentDir);
 		if (parentDir === currentDir) break;
 		if (stopDir && currentDir === stopDir) break;
 		currentDir = parentDir;

package/package.json

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

package/src/config.ts

@@ -1,5 +1,5 @@
 import type { TranspileOption } from "./transform/gts.ts";
-import path from "path-browserify-esm";
+import browserPath from "path-browserify-esm";
 
 export interface GtsConfig extends TranspileOption {}
 
@@ -10,16 +10,24 @@ export interface PackageJson {
 type ReadFileFn = (path: string, encoding: "utf8") => string;
 type ReadFileAsyncFn = (path: string, encoding: "utf8") => Promise<string>;
 
-export interface ResolveGtsConfigSyncOptions {
-  readFileFn: ReadFileFn;
+export interface PathModule {
+  resolve(...paths: string[]): string;
+  dirname(path: string): string;
+  isAbsolute(path: string): boolean;
+}
+
+interface ResolveGtsConfigBaseOptions {
   cwd?: string;
+  pathModule?: PathModule;
   stopDir?: string;
 }
 
-export interface ResolveGtsConfigAsyncOptions {
+export interface ResolveGtsConfigSyncOptions extends ResolveGtsConfigBaseOptions {
+  readFileFn: ReadFileFn;
+}
+
+export interface ResolveGtsConfigAsyncOptions extends ResolveGtsConfigBaseOptions {
   readFileFn: ReadFileAsyncFn;
-  cwd?: string;
-  stopDir?: string;
 }
 
 const DEFAULT_GTS_CONFIG: Required<GtsConfig> = {
@@ -34,6 +42,7 @@ const DEFAULT_GTS_CONFIG: Required<GtsConfig> = {
     "geo",
     "dendro",
     "omni",
+    "$",
   ],
   queryBindings: ["my", "opp"],
 };
@@ -43,10 +52,14 @@ function* resolveGtsConfigImpl(
   inlineConfig: GtsConfig = {},
   options: ResolveGtsConfigAsyncOptions | ResolveGtsConfigSyncOptions,
 ): Generator<string | Promise<string>, Required<GtsConfig>, string> {
-  const startDir = normalizeStartDir(filePath, options.cwd);
-  const stopDir = options.stopDir ? path.resolve(options.stopDir) : void 0;
+  const pathModule = options.pathModule || browserPath;
+  const startDir = normalizeStartDir(filePath, pathModule, options.cwd);
+  const stopDir = options.stopDir
+    ? pathModule.resolve(options.stopDir)
+    : void 0;
   const pkgConfig = yield* findNearestPackageConfig(
     options.readFileFn,
+    pathModule,
     startDir,
     stopDir,
   );
@@ -62,6 +75,7 @@ export async function resolveGtsConfig(
   inlineConfig: GtsConfig,
   options: ResolveGtsConfigAsyncOptions,
 ): Promise<Required<GtsConfig>> {
+  options.pathModule ??= await import("node:path").then((mod) => mod.default);
   const generator = resolveGtsConfigImpl(filePath, inlineConfig, options);
   let result = generator.next();
   while (!result.done) {
@@ -94,26 +108,31 @@ export function resolveGtsConfigSync(
   return result.value;
 }
 
-function normalizeStartDir(sourceFile: string, cwd?: string): string {
-  const absolute = path.isAbsolute(sourceFile)
+function normalizeStartDir(
+  sourceFile: string,
+  pathModule: PathModule,
+  cwd?: string,
+): string {
+  const absolute = pathModule.isAbsolute(sourceFile)
     ? sourceFile
-    : path.resolve(cwd || ".", sourceFile);
-  return path.dirname(absolute);
+    : pathModule.resolve(cwd || ".", sourceFile);
+  return pathModule.dirname(absolute);
 }
 
 function* findNearestPackageConfig(
   readFileFn: ReadFileFn | ReadFileAsyncFn,
+  pathModule: PathModule,
   startDir: string,
   stopDir?: string,
 ): Generator<string | Promise<string>, GtsConfig, string> {
   let currentDir = startDir;
   while (true) {
-    const pkgPath = path.resolve(currentDir, "package.json");
+    const pkgPath = pathModule.resolve(currentDir, "package.json");
     const config = yield* readPackageConfig(readFileFn, pkgPath);
     if (config) {
       return config;
     }
-    const parentDir = path.dirname(currentDir);
+    const parentDir = pathModule.dirname(currentDir);
     if (parentDir === currentDir) {
       break;
     }

package/src/index.ts

@@ -51,4 +51,7 @@ export {
   resolveGtsConfig,
   resolveGtsConfigSync,
   type GtsConfig,
+  type ResolveGtsConfigAsyncOptions,
+  type ResolveGtsConfigSyncOptions,
+  type PathModule,
 } from "./config.ts";

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]
@@ -197,7 +198,8 @@ export function gtsPlugin(options: GtsPluginOption = {}) {
         while (this.type !== tokTypes.braceR && this.type !== tokTypes.eof) {
           // Check for DirectShortcutFunction
           if (
-            (specialIdentifiers as unknown[]).includes(this.value) ||
+            (this.type !== tokTypes.string &&
+              (specialIdentifiers as unknown[]).includes(this.value)) ||
             this.type === tokTypes.colon
           ) {
             node.directAction = this.gts_parseDirectFunction();
@@ -251,12 +253,15 @@ export function gtsPlugin(options: GtsPluginOption = {}) {
             this.isContextual("as"))
         ) {
           // Allow omitting the attribute expression for language tooling
-          const dummy = this.startNodeAt(this.lastTokEnd, this.lastTokEndLoc) as AST.Identifier;
+          const dummy = this.startNodeAt(
+            this.lastTokEnd,
+            this.lastTokEndLoc,
+          ) as AST.Identifier;
           dummy.name = DUMMY_PLACEHOLDER;
           dummy.isDummy = true;
           return this.finishNode(dummy, "Identifier");
         }
-        return this.parseExprAtom();
+        return this.parseExprSubscripts(void 0, false);
       }
 
       gts_parseShortcutFunction() {
@@ -297,7 +302,10 @@ export function gtsPlugin(options: GtsPluginOption = {}) {
             this.type !== tokTypes.name
           ) {
             // Allow omitting the identifier after ':' for language tooling
-            const dummy = this.startNodeAt(this.lastTokEnd, this.lastTokEndLoc) as AST.Identifier;
+            const dummy = this.startNodeAt(
+              this.lastTokEnd,
+              this.lastTokEndLoc,
+            ) as AST.Identifier;
             dummy.name = DUMMY_PLACEHOLDER;
             dummy.isDummy = true;
             node.property = this.finishNode(dummy, "Identifier");

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;
         }
       },
     );