@gi-tcg/gts-transpiler 0.3.0 → 0.3.1

package/dist/index.d.ts

@@ -19,12 +19,6 @@ declare class GtsTranspilerError extends Error {
 	readonly position: SourceLocation2 | null;
 	constructor(message: string, position: SourceLocation2 | null);
 }
-interface PathPolyfill {
-	isAbsolute(filePath: string): boolean;
-	dirname(filePath: string): string;
-	resolve(...segments: string[]): string;
-}
-declare const path: PathPolyfill;
 interface GtsConfig extends TranspileOption {}
 type ReadFileFn = (path: string, encoding: "utf8") => string;
 type ReadFileAsyncFn = (path: string, encoding: "utf8") => Promise<string>;
@@ -42,4 +36,4 @@ declare function resolveGtsConfig(filePath: string, inlineConfig: GtsConfig, opt
 declare function resolveGtsConfigSync(filePath: string, inlineConfig: GtsConfig, options: ResolveGtsConfigSyncOptions): Required<GtsConfig>;
 declare function transpile(source: string, filename: string, option: TranspileOption): TranspileResult;
 declare function transpileForVolar(source: string, filename: string, option: TranspileOption): VolarMappingResult;
-export { transpileForVolar, transpile, resolveGtsConfigSync, resolveGtsConfig, path, VolarMappingResult, TranspileResult, TranspileOption, PathPolyfill, GtsTranspilerError, GtsConfig };
+export { transpileForVolar, transpile, resolveGtsConfigSync, resolveGtsConfig, VolarMappingResult, TranspileResult, TranspileOption, GtsTranspilerError, GtsConfig };

package/dist/index.js

@@ -281,7 +281,7 @@ function gtsPlugin(options = {}) {
         return super.parseExprAtom(refDestructuringErrors, forInit, forNew);
       }
       parseMaybeUnary(refDestructuringErrors, sawUnary, incDec, forInit) {
-        if (this.isContextual("query")) {
+        if (this.isShortcutContext && this.isContextual("query")) {
           const expr = this.gts_parseQueryExpression();
           if (!incDec && this.eat(tokTypes2.starstar)) {
             this.unexpected(this.lastTokStart);
@@ -952,6 +952,15 @@ var commonGtsVisitor = {
                 type: "Literal",
                 value: !!node.star
               }
+            },
+            {
+              type: "Property",
+              key: { type: "Identifier", name: "context" },
+              computed: false,
+              kind: "init",
+              method: false,
+              shorthand: false,
+              value: state.fnArgId
             }
           ]
         }
@@ -2173,77 +2182,7 @@ function transform(ast, option = {}, sourceInfo = {}) {
   };
 }
 // packages/transpiler/src/config.ts
-var path = globalThis.require ? globalThis.require("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) {
-  return filePath.replace(/\\+/g, "/");
-}
-function normalizeResolvedPath(filePath) {
-  const normalized = normalizeSlashes(filePath);
-  const isAbsolute = normalized.startsWith("/");
-  const parts = normalized.split("/");
-  const stack = [];
-  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 path from "path-browserify-esm";
 var DEFAULT_GTS_CONFIG = {
   runtimeImportSource: "@gi-tcg/gts-runtime",
   providerImportSource: "@gi-tcg/core/gts",
@@ -2347,6 +2286,5 @@ export {
   transpile,
   resolveGtsConfigSync,
   resolveGtsConfig,
-  path,
   GtsTranspilerError
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gi-tcg/gts-transpiler",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "repository": "https://github.com/piovium/gts.git",
   "license": "Apache-2.0",
   "type": "module",
@@ -22,6 +22,7 @@
     "acorn": "8.15.0",
     "esrap": "2.2.1",
     "magic-string": "^0.30.21",
+    "path-browserify-esm": "^1.0.6",
     "zimmerframe": "^1.1.4"
   },
   "devDependencies": {

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 path from "path-browserify-esm";
 
 export interface GtsConfig extends TranspileOption {}
 

package/src/index.ts

@@ -39,6 +39,4 @@ export {
   resolveGtsConfig,
   resolveGtsConfigSync,
   type GtsConfig,
-  path,
-  type PathPolyfill,
 } from "./config";

package/src/parse/gts_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/transform/gts.ts

@@ -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,
+            }
           ],
         },
       ],