@gi-tcg/gts-transpiler 0.3.0 → 0.3.2

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@gi-tcg/gts-transpiler",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "repository": "https://github.com/piovium/gts.git",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "bun": "./src/index.ts",
+      "development": "./src/index.ts",
       "default": "./dist/index.js"
     }
   },
@@ -15,18 +15,21 @@
     "src",
     "dist"
   ],
-  "scripts": {},
   "dependencies": {
     "@jridgewell/sourcemap-codec": "^1.5.5",
     "@sveltejs/acorn-typescript": "^1.0.8",
-    "acorn": "8.15.0",
+    "acorn": "^8.15.0",
     "esrap": "2.2.1",
     "magic-string": "^0.30.21",
+    "path-browserify-esm": "^1.0.6",
     "zimmerframe": "^1.1.4"
   },
   "devDependencies": {
     "@types/node": "^24.3.0",
     "@types/estree": "^1.0.8",
     "@volar/language-core": "^2.4.27"
+  },
+  "scripts": {
+    "build": "tsdown --platform neutral"
   }
-}
+}

package/src/config.ts

@@ -1,89 +1,5 @@
-import type { TranspileOption } from "./transform/gts";
-
-export interface PathPolyfill {
-  isAbsolute(filePath: string): boolean;
-  dirname(filePath: string): string;
-  resolve(...segments: string[]): string;
-}
-
-export const path: PathPolyfill = globalThis.require
-  ? (globalThis.require("node:path") as typeof import("node:path"))
-  : {
-      isAbsolute(filePath) {
-        return filePath.startsWith("/");
-      },
-      dirname(filePath) {
-        if (!filePath) {
-          return ".";
-        }
-        const normalized = normalizeSlashes(filePath);
-        if (normalized === "/") {
-          return "/";
-        }
-        const trimmed =
-          normalized.length > 1 && normalized.endsWith("/")
-            ? normalized.slice(0, -1)
-            : normalized;
-        const idx = trimmed.lastIndexOf("/");
-        if (idx < 0) {
-          return ".";
-        }
-        if (idx === 0) {
-          return "/";
-        }
-        return trimmed.slice(0, idx);
-      },
-      resolve(...segments) {
-        if (segments.length === 0) {
-          return ".";
-        }
-        let resolved = "";
-        for (let i = segments.length - 1; i >= 0; i--) {
-          const segment = segments[i];
-          if (!segment) {
-            continue;
-          }
-          if (resolved) {
-            resolved = `${segment}/${resolved}`;
-          } else {
-            resolved = segment;
-          }
-          if (path.isAbsolute(segment)) {
-            break;
-          }
-        }
-        return normalizeResolvedPath(resolved || ".");
-      },
-    };
-
-function normalizeSlashes(filePath: string): string {
-  return filePath.replace(/\\+/g, "/");
-}
-
-function normalizeResolvedPath(filePath: string): string {
-  const normalized = normalizeSlashes(filePath);
-  const isAbsolute = normalized.startsWith("/");
-  const parts = normalized.split("/");
-  const stack: string[] = [];
-  for (const part of parts) {
-    if (!part || part === ".") {
-      continue;
-    }
-    if (part === "..") {
-      if (stack.length > 0 && stack[stack.length - 1] !== "..") {
-        stack.pop();
-      } else if (!isAbsolute) {
-        stack.push("..");
-      }
-      continue;
-    }
-    stack.push(part);
-  }
-  if (isAbsolute) {
-    return `/${stack.join("/")}` || "/";
-  }
-  return stack.join("/") || ".";
-}
+import type { TranspileOption } from "./transform/gts.ts";
+import path from "path-browserify-esm";
 
 export interface GtsConfig extends TranspileOption {}
 

package/src/error.ts

@@ -1,11 +1,10 @@
 import type { SourceLocation } from "estree";
 
 export class GtsTranspilerError extends Error {
-  constructor(
-    message: string,
-    public readonly position: SourceLocation | null,
-  ) {
+  public readonly position: SourceLocation | null;
+  constructor(message: string, position: SourceLocation | null) {
     super(message);
     this.name = "GtsTranspilerError";
+    this.position = position;
   }
 }

package/src/index.ts

@@ -1,12 +1,12 @@
-import { parse, parseLoose } from "./parse";
+import { parse, parseLoose } from "./parse/index.ts";
 import {
   transform,
   transformForVolar,
   type TranspileResult,
-} from "./transform";
-import type { TranspileOption } from "./transform/gts";
-import type { VolarMappingResult } from "./transform/volar";
-export { GtsTranspilerError } from "./error";
+} from "./transform/index.ts";
+import type { TranspileOption } from "./transform/gts.ts";
+import type { VolarMappingResult } from "./transform/volar/index.ts";
+export { GtsTranspilerError } from "./error.ts";
 
 export function transpile(
   source: string,
@@ -39,6 +39,4 @@ export {
   resolveGtsConfig,
   resolveGtsConfigSync,
   type GtsConfig,
-  path,
-  type PathPolyfill,
-} from "./config";
+} from "./config.ts";

package/src/parse/gts_plugin.ts

@@ -1,7 +1,7 @@
 import { tokTypes, type Parser as ParserClass } from "acorn";
-import type { Parse, AST } from "../types";
-import { specialIdentifiers } from "../keywords";
-import { DUMMY_PLACEHOLDER } from "./loose_plugin";
+import type { Parse, AST } from "../types.ts";
+import { specialIdentifiers } from "../keywords.ts";
+import { DUMMY_PLACEHOLDER } from "./loose_plugin.ts";
 
 /*
 
@@ -316,7 +316,7 @@ export function gtsPlugin(options: GtsPluginOption = {}) {
         incDec?: boolean,
         forInit?: boolean | "await",
       ): AST.Expression {
-        if (this.isContextual("query")) {
+        if (this.isShortcutContext && this.isContextual("query")) {
           const expr = this.gts_parseQueryExpression();
           if (!incDec && this.eat(tokTypes.starstar)) {
             this.unexpected(this.lastTokStart);

package/src/parse/index.ts

@@ -1,11 +1,11 @@
 import { Parser } from "acorn";
 import type { Position, Program } from "estree";
 import { tsPlugin } from "@sveltejs/acorn-typescript";
-import { gtsPlugin, type GtsPluginOption } from "./gts_plugin.js";
-import { loosePlugin } from "./loose_plugin.js";
+import { gtsPlugin, type GtsPluginOption } from "./gts_plugin.ts";
+import { loosePlugin } from "./loose_plugin.ts";
 import { getCommentHandlers } from "./comment.js";
-import { GtsTranspilerError } from "../error.js";
-import { recordCallLParenPlugin } from "./record_call_lparen_plugin.js";
+import { GtsTranspilerError } from "../error.ts";
+import { recordCallLParenPlugin } from "./record_call_lparen_plugin.ts";
 
 const TsParser = Parser.extend(tsPlugin());
 

package/src/parse/record_call_lparen_plugin.ts

@@ -1,5 +1,5 @@
 import { tokTypes, type Parser } from "acorn";
-import type { AST, Parse } from "../types.js";
+import type { AST, Parse } from "../types.ts";
 
 /**
  * A plugin that records the location of the left parenthesis in CallExpression and 

package/src/transform/erase_ts.ts

@@ -7,7 +7,7 @@ import type {
   Node,
   EmptyStatement,
 } from "estree";
-import { GtsTranspilerError } from "../error";
+import { GtsTranspilerError } from "../error.ts";
 
 const empty: EmptyStatement = {
   type: "EmptyStatement",
@@ -201,4 +201,4 @@ const eraseTsVisitor: Visitors<any, null> = {
 
 export const eraseTs = <T>(ast: T): T => {
   return walk(ast, null, eraseTsVisitor);
-}
+}

package/src/transform/gts.ts

@@ -16,11 +16,11 @@ import type {
   Statement,
 } from "estree";
 import { walk, type Visitors } from "zimmerframe";
-import { GtsTranspilerError } from "../error";
+import { GtsTranspilerError } from "../error.ts";
 import {
   DEFAULT_QUERY_BINDINGS,
   DEFAULT_SHORTCUT_FUNCTION_PRELUDES,
-} from "./constants";
+} from "./constants.ts";
 
 export interface ExternalizedBinding {
   bindingName: Identifier;
@@ -162,6 +162,15 @@ export const commonGtsVisitor: Visitors<Node, TranspileState> = {
                 value: !!node.star,
               },
             },
+            {
+              type: "Property",
+              key: { type: "Identifier", name: "context" },
+              computed: false,
+              kind: "init",
+              method: false,
+              shorthand: false,
+              value: state.fnArgId,
+            }
           ],
         },
       ],

package/src/transform/index.ts

@@ -1,9 +1,9 @@
 import type { Program } from "estree";
-import { eraseTs } from "./erase_ts";
+import { eraseTs } from "./erase_ts.ts";
 import { print } from "esrap";
 import jsPrinter from "esrap/languages/ts";
 import type { SourceMap } from "magic-string";
-import { gtsToTs, type TranspileOption } from "./gts";
+import { gtsToTs, type TranspileOption } from "./gts.ts";
 
 export interface TranspileResult {
   code: string;
@@ -33,4 +33,4 @@ export function transform(
   };
 }
 
-export { transformForVolar } from "./volar";
+export { transformForVolar } from "./volar/index.ts";

package/src/transform/volar/index.ts

@@ -1,18 +1,18 @@
-import type { AST } from "../../types";
+import type { AST } from "../../types.ts";
 import { walk } from "zimmerframe";
-import type { SourceInfo, TranspileResult } from "..";
+import type { SourceInfo, TranspileResult } from "../index.ts";
 import { print } from "esrap";
 import {
   initialTranspileState,
   type TranspileOption,
   type TranspileState,
-} from "../gts";
-import { gtsToTypingsWalker, type TypingTranspileState } from "./walker";
-import { applyReplacements } from "./replacements";
+} from "../gts.ts";
+import { gtsToTypingsWalker, type TypingTranspileState } from "./walker.ts";
+import { applyReplacements } from "./replacements.ts";
 import type { Program } from "estree";
-import { convertToVolarMappings, type VolarMappingResult } from "./mappings";
-import { collectLeafTokens, type LeafToken } from "./collect_tokens";
-import { patchedPrinter } from "./printer";
+import { convertToVolarMappings, type VolarMappingResult } from "./mappings.ts";
+import { collectLeafTokens, type LeafToken } from "./collect_tokens.ts";
+import { patchedPrinter } from "./printer.ts";
 
 interface TypingTranspileOption extends TranspileOption {
   leafTokens: LeafToken[];
@@ -81,4 +81,4 @@ export function transformForVolar(
   };
 }
 
-export type { VolarMappingResult } from "./mappings";
+export type { VolarMappingResult } from "./mappings.ts";

package/src/transform/volar/mappings.ts

@@ -1,6 +1,6 @@
 import { decode } from "@jridgewell/sourcemap-codec";
 import type { CodeInformation, CodeMapping } from "@volar/language-core";
-import type { LeafToken } from "./collect_tokens";
+import type { LeafToken } from "./collect_tokens.ts";
 
 export interface VolarMappingResult {
   code: string;

package/src/transform/volar/printer.ts

@@ -1,5 +1,5 @@
 import tsPrinter from "esrap/languages/ts";
-import type { AST } from "../../types";
+import type { AST } from "../../types.ts";
 import type { Context, Visitors } from "esrap";
 import type { Node, SimpleCallExpression } from "estree";
 

package/src/transform/volar/replacements.ts

@@ -1,5 +1,5 @@
 import type { ExpressionStatement } from "estree";
-import type { TypingTranspileState } from "./walker";
+import type { TypingTranspileState } from "./walker.ts";
 
 type ReplacementPayload =
   | {

package/src/transform/volar/walker.ts

@@ -24,9 +24,9 @@ import {
   commonGtsVisitor,
   type ExternalizedBinding,
   type TranspileState,
-} from "../gts";
-import type { LeafToken } from "./collect_tokens";
-import { createReplacementHolder } from "./replacements";
+} from "../gts.ts";
+import type { LeafToken } from "./collect_tokens.ts";
+import { createReplacementHolder } from "./replacements.ts";
 
 interface ExternalizedTypedBinding extends ExternalizedBinding {
   typingId: Identifier;

package/src/types.ts

@@ -107,7 +107,7 @@ declare module "acorn" {
   }
 }
 
-export namespace Parse {
+export declare namespace Parse {
   /**
    * Destructuring errors object used during expression parsing
    * See: https://github.com/acornjs/acorn/blob/main/acorn/src/parseutil.js
@@ -365,7 +365,7 @@ export namespace Parse {
    * They are accessed by Ripple's custom parser plugin for whitespace handling,
    * JSX parsing, and other advanced features.
    */
-  export declare class Parser extends acorn.Parser {
+  export class Parser extends acorn.Parser {
     // ============================================================
     // Position and Location Tracking
     // ============================================================